summaryrefslogtreecommitdiff
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/fpg_base.pas2
-rw-r--r--src/corelib/fpg_imgfmt_png.pas6
-rw-r--r--src/corelib/fpg_main.pas2
-rw-r--r--src/corelib/gdi/fpg_gdi.pas45
-rw-r--r--src/corelib/gdi/fpgui_toolkit.lpk4
-rw-r--r--src/corelib/gdi/fpgui_toolkit.pas26
-rw-r--r--src/corelib/lang_af.inc4
-rw-r--r--src/corelib/lang_de.inc4
-rw-r--r--src/corelib/lang_en.inc4
-rw-r--r--src/corelib/lang_es.inc4
-rw-r--r--src/corelib/lang_fr.inc48
-rw-r--r--src/corelib/lang_it.inc4
-rw-r--r--src/corelib/lang_pt.inc4
-rw-r--r--src/corelib/lang_ru.inc4
-rw-r--r--src/corelib/render/software/Agg2D.pas8
-rw-r--r--src/corelib/render/software/agg_color.pas3
-rw-r--r--src/corelib/render/software/agg_scanline_storage_aa.pas3
-rw-r--r--src/corelib/render/software/fpg_fontcache.pas1
-rw-r--r--src/corelib/x11/fpg_netlayer_x11.pas2
-rw-r--r--src/corelib/x11/fpg_x11.pas3
-rw-r--r--src/corelib/x11/fpgui_toolkit.lpk3
21 files changed, 121 insertions, 63 deletions
diff --git a/src/corelib/fpg_base.pas b/src/corelib/fpg_base.pas
index c110f3b0..9177e420 100644
--- a/src/corelib/fpg_base.pas
+++ b/src/corelib/fpg_base.pas
@@ -123,7 +123,7 @@ const
var
- {$IFDEF MSWINDOWS}
+ {$IFDEF WINDOWS}
FPG_DEFAULT_FONT_DESC: string = 'Arial-8:antialias=true';
FPG_DEFAULT_SANS: string = 'Arial';
{$ENDIF}
diff --git a/src/corelib/fpg_imgfmt_png.pas b/src/corelib/fpg_imgfmt_png.pas
index 3148a5b4..c4ee504f 100644
--- a/src/corelib/fpg_imgfmt_png.pas
+++ b/src/corelib/fpg_imgfmt_png.pas
@@ -1,7 +1,7 @@
{
fpGUI - Free Pascal GUI Toolkit
- Copyright (C) 2006 - 2014 See the file AUTHORS.txt, included in this
+ Copyright (C) 2006 - 2015 See the file AUTHORS.txt, included in this
distribution, for details of the copyright.
See the file COPYING.modifiedLGPL, included in this distribution,
@@ -32,7 +32,7 @@ uses
function LoadImage_PNG(const AFileName: TfpgString): TfpgImage; overload;
function LoadImage_PNG(AStream: TStream): TfpgImage; overload;
function LoadImage_PNG(const AImageData: Pointer; const AImageDataSize: LongWord): TfpgImage; overload;
-function LoadImage_PNG(AInstance: THandle; const AResName: String; AResType: PChar): TfpgImage; overload;
+function LoadImage_PNG(AInstance: THandle; const AResName: String; AResType: {$IFNDEF WINCE} PChar {$ELSE} PWideChar{$ENDIF}): TfpgImage; overload;
function LoadImage_PNGcrop(const AMaxWidth, AMaxHeight: integer; const AFileName: TfpgString): TfpgImage;
@@ -134,7 +134,7 @@ begin
end;
end;
-function LoadImage_PNG(AInstance: THandle; const AResName: String; AResType: PChar): TfpgImage;
+function LoadImage_PNG(AInstance: THandle; const AResName: String; AResType: {$IFNDEF WINCE} PChar {$ELSE} PWideChar{$ENDIF}): TfpgImage;
var
res: TResourceStream;
begin
diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas
index 1f063cb5..275543cf 100644
--- a/src/corelib/fpg_main.pas
+++ b/src/corelib/fpg_main.pas
@@ -1760,7 +1760,7 @@ end;
procedure TfpgApplication.ShowException(E: Exception);
begin
- TfpgMessageDialog.Critical('An unexpected error occurred.', E.Message);
+ TfpgMessageDialog.Critical(rsErrUnexpected, E.Message);
end;
procedure TfpgApplication.WaitWindowMessage(atimeoutms: integer);
diff --git a/src/corelib/gdi/fpg_gdi.pas b/src/corelib/gdi/fpg_gdi.pas
index a1d314f6..e909782e 100644
--- a/src/corelib/gdi/fpg_gdi.pas
+++ b/src/corelib/gdi/fpg_gdi.pas
@@ -1,7 +1,7 @@
{
fpGUI - Free Pascal GUI Toolkit
- Copyright (C) 2006 - 2014 See the file AUTHORS.txt, included in this
+ Copyright (C) 2006 - 2015 See the file AUTHORS.txt, included in this
distribution, for details of the copyright.
See the file COPYING.modifiedLGPL, included in this distribution,
@@ -30,6 +30,14 @@ unit fpg_gdi;
{.$Define DND_DEBUG}
{.$Define DEBUGKEYS}
+// enable or disable DND support. Disabled by default while implementing AlienWindows.
+{$define HAS_DND}
+
+{$IFDEF WINCE}
+ // WinCE doesn't have DND support
+ {$undefine HAS_DND}
+{$ENDIF}
+
interface
uses
@@ -42,7 +50,9 @@ uses
{$IFDEF DEBUG}
,fpg_dbugintf
{$ENDIF DEBUG}
+ {$IFDEF HAS_DND}
,fpg_OLEDragDrop
+ {$ENDIF}
;
{ Constants missing on windows unit }
@@ -153,15 +163,19 @@ type
TfpgGDIWindow = class(TfpgWindowBase)
private
+ {$IFDEF HAS_DND}
FDropManager: TfpgOLEDropTarget;
+ {$ENDIF}
FDropPos: TPoint;
FUserMimeSelection: TfpgString;
FUserAcceptDrag: Boolean;
- function GetDropManager: TfpgOLEDropTarget;
+ {$IFDEF HAS_DND}
procedure HandleDNDLeave(Sender: TObject);
procedure HandleDNDEnter(Sender: TObject; DataObj: IDataObject; KeyState: Longint; PT: TPoint; var Effect: DWORD);
+ function GetDropManager: TfpgOLEDropTarget;
procedure HandleDNDPosition(Sender: TObject; KeyState: Longint; PT: TPoint; var Effect: TfpgOLEDragDropEffect);
procedure HandleDNDDrop(Sender: TObject; DataObj: IDataObject; KeyState: Longint; PT: TPoint; Effect: TfpgOLEDragDropEffect);
+ {$ENDIF}
private
FMouseInWindow: boolean;
FNonFullscreenRect: TfpgRect;
@@ -171,7 +185,9 @@ type
QueueAcceptDrops: boolean;
function DoMouseEnterLeaveCheck(AWindow: TfpgGDIWindow; uMsg, wParam, lParam: Cardinal): Boolean;
procedure WindowSetFullscreen(aFullScreen, aUpdate: boolean);
+ {$IFDEF HAS_DND}
property DropManager: TfpgOLEDropTarget read GetDropManager;
+ {$ENDIF}
protected
FWinHandle: TfpgWinHandle;
FModalForWin: TfpgGDIWindow;
@@ -1445,6 +1461,7 @@ var
// this are required for Windows MouseEnter & MouseExit detection.
uLastWindowHndl: TfpgWinHandle;
+{$IFDEF HAS_DND}
procedure TfpgGDIWindow.HandleDNDLeave(Sender: TObject);
var
wg: TfpgWidget;
@@ -1610,6 +1627,7 @@ begin
end;
Result := FDropManager;
end;
+{$ENDIF HAS_DND}
function TfpgGDIWindow.DoMouseEnterLeaveCheck(AWindow: TfpgGDIWindow; uMsg, wParam, lParam: Cardinal): Boolean;
var
@@ -2016,6 +2034,7 @@ end;
procedure TfpgGDIWindow.DoAcceptDrops(const AValue: boolean);
begin
+ {$IFDEF HAS_DND}
if AValue then
begin
if HasHandle then
@@ -2029,6 +2048,7 @@ begin
DropManager.RevokeDragDrop;
QueueAcceptDrops := False;
end;
+ {$ENDIF}
end;
procedure TfpgGDIWindow.DoDragStartDetected;
@@ -2066,7 +2086,9 @@ begin
else
begin
+ {$IFNDEF WINCE}
placement.length:= sizeof(placement);
+ // This Windows function doesn't exist in WinCE
if GetWindowPlacement(FWinHandle, placement) then
begin
case placement.ShowCmd of
@@ -2074,6 +2096,7 @@ begin
SW_SHOWMINIMIZED: result:= wsMinimized;
end;
end;
+ {$ENDIF}
end; { case..else }
end; { case }
end;
@@ -2082,7 +2105,9 @@ constructor TfpgGDIWindow.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
FWinHandle := 0;
+ {$IFDEF HAS_DND}
FDropManager := nil;
+ {$ENDIF}
FDropPos.x := 0;
FDropPos.y := 0;
FFullscreenIsSet := false;
@@ -2092,8 +2117,10 @@ end;
destructor TfpgGDIWindow.Destroy;
begin
+ {$IFDEF HAS_DND}
if Assigned(FDropManager) then
FDropManager.Free;
+ {$ENDIF}
inherited Destroy;
end;
@@ -3027,10 +3054,13 @@ var
M: PStgMedium;
itm: TfpgMimeDataItem;
lEffects: DWORD;
+ {$IFDEF HAS_DND}
FDataObject: TfpgOLEDataObject;
FDropSource: TfpgOLEDropSource;
+ {$ENDIF}
lIsTranslated: boolean;
begin
+ {$IFDEF HAS_DND}
if FDragging then
begin
{$IFDEF DND_DEBUG}
@@ -3121,6 +3151,7 @@ begin
// (FDropSource as IUnknown)._Release;
// (FDataObject as IUnknown)._Release;
end;
+ {$ENDIF HAS_DND}
end;
{ TGDIDragManager }
@@ -3164,18 +3195,22 @@ end;
procedure TGDIDragManager.RegisterDragDrop;
begin
+ {$IFDEF HAS_DND}
Activex.RegisterDragDrop(TfpgWidget(FDropTarget).WinHandle, self as IDropTarget)
+ {$ENDIF}
end;
procedure TGDIDragManager.RevokeDragDrop;
begin
+ {$IFDEF HAS_DND}
ActiveX.RevokeDragDrop(TfpgWidget(FDropTarget).WinHandle);
+ {$ENDIF}
end;
{$IF FPC_FULLVERSION<20602}
procedure TimerCallBackProc(hWnd: HWND; uMsg: UINT; idEvent: UINT; dwTime: DWORD); stdcall;
{$ELSE}
-procedure TimerCallBackProc(hWnd: HWND; uMsg: UINT; idEvent: UINT_PTR; dwTime: DWORD); stdcall;
+procedure TimerCallBackProc(hWnd: HWND; uMsg: UINT; idEvent: UINT_PTR; dwTime: DWORD); {$IFNDEF WINCE} stdcall; {$ELSE} cdecl; {$ENDIF}
{$IFEND}
begin
{ idEvent contains the handle to the timer that got triggered }
@@ -3240,12 +3275,12 @@ end;
initialization
wapplication := nil;
MouseFocusedWH := 0;
- NeedToUnitialize := Succeeded(OleInitialize(nil));
{$IFDEF WinCE}
UnicodeEnabledOS := True;
FontSmoothingType := DEFAULT_QUALITY;
{$ELSE}
+ NeedToUnitialize := Succeeded(OleInitialize(nil));
WinVersion.dwOSVersionInfoSize := SizeOf(TOSVersionInfo);
GetVersionEx(WinVersion);
UnicodeEnabledOS := (WinVersion.dwPlatformID = VER_PLATFORM_WIN32_NT) or
@@ -3256,11 +3291,11 @@ initialization
FontSmoothingType := CLEARTYPE_QUALITY
else
FontSmoothingType := ANTIALIASED_QUALITY;
-{$ENDIF}
finalization
if NeedToUnitialize then
OleUninitialize;
+{$ENDIF}
end.
diff --git a/src/corelib/gdi/fpgui_toolkit.lpk b/src/corelib/gdi/fpgui_toolkit.lpk
index 3566dc09..e14414e4 100644
--- a/src/corelib/gdi/fpgui_toolkit.lpk
+++ b/src/corelib/gdi/fpgui_toolkit.lpk
@@ -30,7 +30,7 @@
</CompilerOptions>
<Description Value="fpGUI Toolkit"/>
<License Value="LGPL 2 with static linking exception."/>
- <Version Major="1" Minor="4"/>
+ <Version Major="1" Minor="4" Release="1"/>
<Files Count="107">
<Item1>
<Filename Value="..\stdimages.inc"/>
@@ -166,6 +166,7 @@
</Item33>
<Item34>
<Filename Value="fpg_oledragdrop.pas"/>
+ <AddToUsesPkgSection Value="False"/>
<UnitName Value="fpg_OLEDragDrop"/>
</Item34>
<Item35>
@@ -422,6 +423,7 @@
</Item97>
<Item98>
<Filename Value="..\render\software\Agg2D.pas"/>
+ <AddToUsesPkgSection Value="False"/>
<UnitName Value="Agg2D"/>
</Item98>
<Item99>
diff --git a/src/corelib/gdi/fpgui_toolkit.pas b/src/corelib/gdi/fpgui_toolkit.pas
index 4704d56a..2cc8e7f0 100644
--- a/src/corelib/gdi/fpgui_toolkit.pas
+++ b/src/corelib/gdi/fpgui_toolkit.pas
@@ -2,27 +2,27 @@
This source is only used to compile and install the package.
}
-unit fpgui_toolkit;
+unit fpgui_toolkit;
interface
uses
- fpg_base, fpg_main, fpg_cmdlineparams, fpg_command_intf, fpg_constants,
+ fpg_base, fpg_main, fpg_cmdlineparams, fpg_command_intf, fpg_constants,
fpg_extinterpolation, fpg_imagelist, fpg_imgfmt_bmp, fpg_pofiles,
fpg_popupwindow, fpg_stdimages, fpg_stringhashlist, fpg_translations,
fpg_stringutils, fpg_utils, fpg_widget, fpg_wuline, fpg_impl, fpg_gdi,
- fpg_OLEDragDrop, fpg_animation, fpg_basegrid, fpg_button, fpg_checkbox,
- fpg_combobox, fpg_customgrid, fpg_dialogs, fpg_editcombo, fpg_edit,
- fpg_form, fpg_gauge, fpg_grid, fpg_hyperlink, fpg_iniutils, fpg_label,
- fpg_listbox, fpg_listview, fpg_memo, fpg_menu, fpg_mru, fpg_panel,
- fpg_popupcalendar, fpg_progressbar, fpg_radiobutton, fpg_scrollbar,
- fpg_style, fpg_tab, fpg_trackbar, fpg_tree, fpgui_db, fpg_splitter,
- fpg_hint, fpg_spinedit, fpg_extgraphics, fpg_ColorMapping, fpg_ColorWheel,
- fpg_interface, fpg_editbtn, fpg_imgfmt_jpg, fpg_imgutils, fpg_stylemanager,
- fpg_style_win2k, fpg_style_motif, fpg_style_clearlooks, fpg_style_bluecurve,
+ fpg_animation, fpg_basegrid, fpg_button, fpg_checkbox, fpg_combobox,
+ fpg_customgrid, fpg_dialogs, fpg_editcombo, fpg_edit, fpg_form, fpg_gauge,
+ fpg_grid, fpg_hyperlink, fpg_iniutils, fpg_label, fpg_listbox, fpg_listview,
+ fpg_memo, fpg_menu, fpg_mru, fpg_panel, fpg_popupcalendar, fpg_progressbar,
+ fpg_radiobutton, fpg_scrollbar, fpg_style, fpg_tab, fpg_trackbar, fpg_tree,
+ fpgui_db, fpg_splitter, fpg_hint, fpg_spinedit, fpg_extgraphics,
+ fpg_ColorMapping, fpg_ColorWheel, fpg_interface, fpg_editbtn,
+ fpg_imgfmt_jpg, fpg_imgutils, fpg_stylemanager, fpg_style_win2k,
+ fpg_style_motif, fpg_style_clearlooks, fpg_style_bluecurve,
fpg_style_bitmap, fpg_readonly, fpg_imgfmt_png, U_Command, U_Pdf, U_Report,
- U_ReportImages, U_Visu, fpg_trayicon, Agg2D, fpg_dbugintf, fpg_dbugmsg,
- fpg_style_carbon, fpg_style_plastic, fpg_style_win8, fpg_toggle,
+ U_ReportImages, U_Visu, fpg_trayicon, fpg_dbugintf, fpg_dbugmsg,
+ fpg_style_carbon, fpg_style_plastic, fpg_style_win8, fpg_toggle,
fpg_StringGridBuilder, fpg_CSVParser;
implementation
diff --git a/src/corelib/lang_af.inc b/src/corelib/lang_af.inc
index 173dd6b2..f822e9dc 100644
--- a/src/corelib/lang_af.inc
+++ b/src/corelib/lang_af.inc
@@ -12,6 +12,7 @@ rsall = 'Alles';
rsallfiles = 'Alle Lêers';
rscollectionallfonts = 'Alle Lettertipes';
rskeyalt = 'Alt+';
+rserrunexpected = 'An unexpected error occurred.';
rsantialiasing = 'Anti-aliasing';
rsshortapr = 'Apr';
rslongapr = 'April';
@@ -21,6 +22,7 @@ rslongaug = 'Augustus';
rskeybksp = 'BkSp';
rscolorblue = 'Blue';
rsbold = 'Vetdruk';
+rsbookmarks = 'Bookmarks';
rscancel = 'Kanselleer';
rscannotcreatedir = 'Kan nie die lêergids skep nie';
rschange = 'Verander';
@@ -74,6 +76,8 @@ rscollectionfontaliases = 'Font Kenname';
rserrreportfontfilemissing = 'Font lêer" <%s.fnt> is nie gevind nie';
rsshortfri = 'Vr';
rslongfri = 'Vrydag';
+rsgotoparentdirectory = 'Go to parent directory';
+rsgotohomedirectory = 'Got to home directory';
rscolorgreen = 'Green';
rsfilegroup = 'Groep';
rshelp = 'Help';
diff --git a/src/corelib/lang_de.inc b/src/corelib/lang_de.inc
index a261926f..18f96adb 100644
--- a/src/corelib/lang_de.inc
+++ b/src/corelib/lang_de.inc
@@ -12,6 +12,7 @@ rsall = 'Alle';
rsallfiles = 'Alle Dateien';
rscollectionallfonts = 'Alle Schriften';
rskeyalt = 'Alt+';
+rserrunexpected = 'An unexpected error occurred.';
rsantialiasing = 'Antialiasing';
rsshortapr = 'Apr';
rslongapr = 'April';
@@ -21,6 +22,7 @@ rslongaug = 'August';
rskeybksp = 'BkSp';
rscolorblue = 'Blue';
rsbold = 'Fett';
+rsbookmarks = 'Bookmarks';
rscancel = 'Abbrechen';
rscannotcreatedir = 'Kann Verzeichnis nicht anlegen';
rschange = 'Ändern';
@@ -74,6 +76,8 @@ rscollectionfontaliases = 'Font-Aliase';
rserrreportfontfilemissing = 'Font file <%s.fnt> not found';
rsshortfri = 'Fre';
rslongfri = 'Freitag';
+rsgotoparentdirectory = 'Go to parent directory';
+rsgotohomedirectory = 'Got to home directory';
rscolorgreen = 'Green';
rsfilegroup = 'Gruppe';
rshelp = 'Hilfe';
diff --git a/src/corelib/lang_en.inc b/src/corelib/lang_en.inc
index aec26b22..d1c1fcc4 100644
--- a/src/corelib/lang_en.inc
+++ b/src/corelib/lang_en.inc
@@ -12,6 +12,7 @@ rsall = 'All';
rsallfiles = 'All Files';
rscollectionallfonts = 'All Fonts';
rskeyalt = 'Alt+';
+rserrunexpected = 'An unexpected error occurred.';
rsantialiasing = 'Anti aliasing';
rsshortapr = 'Apr';
rslongapr = 'April';
@@ -21,6 +22,7 @@ rslongaug = 'August';
rskeybksp = 'BkSp';
rscolorblue = 'Blue';
rsbold = 'Bold';
+rsbookmarks = 'Bookmarks';
rscancel = 'Cancel';
rscannotcreatedir = 'Cannot create directory';
rschange = 'Change';
@@ -74,6 +76,8 @@ rscollectionfontaliases = 'Font Aliases';
rserrreportfontfilemissing = 'Font file <%s.fnt> not found';
rsshortfri = 'Fri';
rslongfri = 'Friday';
+rsgotoparentdirectory = 'Go to parent directory';
+rsgotohomedirectory = 'Got to home directory';
rscolorgreen = 'Green';
rsfilegroup = 'Group';
rshelp = 'Help';
diff --git a/src/corelib/lang_es.inc b/src/corelib/lang_es.inc
index f53ccb76..1c0ca2cd 100644
--- a/src/corelib/lang_es.inc
+++ b/src/corelib/lang_es.inc
@@ -12,6 +12,7 @@ rsall = 'Todos';
rsallfiles = 'Todos los Archivos';
rscollectionallfonts = 'Todas las Fuentes';
rskeyalt = 'Alt+';
+rserrunexpected = 'An unexpected error occurred.';
rsantialiasing = 'Anti aliasing';
rsshortapr = 'Apr';
rslongapr = 'April';
@@ -21,6 +22,7 @@ rslongaug = 'August';
rskeybksp = 'BkSp';
rscolorblue = 'Blue';
rsbold = 'Negrita';
+rsbookmarks = 'Bookmarks';
rscancel = 'Cancelar';
rscannotcreatedir = 'No se puede crear la carpeta';
rschange = 'Cambiar';
@@ -74,6 +76,8 @@ rscollectionfontaliases = 'Aliases de Fuentes';
rserrreportfontfilemissing = 'Font file <%s.fnt> not found';
rsshortfri = 'Vie';
rslongfri = 'Viernes';
+rsgotoparentdirectory = 'Go to parent directory';
+rsgotohomedirectory = 'Got to home directory';
rscolorgreen = 'Green';
rsfilegroup = 'Grupo';
rshelp = 'Ayuda';
diff --git a/src/corelib/lang_fr.inc b/src/corelib/lang_fr.inc
index 0a9a8e21..7ccad790 100644
--- a/src/corelib/lang_fr.inc
+++ b/src/corelib/lang_fr.inc
@@ -12,28 +12,30 @@ rsall = 'Tous';
rsallfiles = 'Tous les fichiers';
rscollectionallfonts = 'Toutes les polices';
rskeyalt = 'Alt+';
+rserrunexpected = 'An unexpected error occurred.';
rsantialiasing = 'Anti alias';
rsshortapr = 'Avr';
rslongapr = 'Avril';
rsfileattributes = 'Attributs';
rsshortaug = 'Aoû';
rslongaug = 'Août';
-rskeybksp = 'BkSp';
-rscolorblue = 'Blue';
+rskeybksp = 'Retour';
+rscolorblue = 'Bleu';
rsbold = 'Gras';
+rsbookmarks = 'Signets';
rscancel = 'Annuler';
rscannotcreatedir = 'Impossible de créer le répertoire';
rschange = 'Modifier';
rschangetitle = 'Changer le titre';
rscharactermap = 'Table de caractères';
-rscolorpickerhint = 'Click on Picker and maintain click => release to get the color';
+rscolorpickerhint = 'Cliquer le Picker et le maintenir => relacher pour avoir la couleur';
rsclose = 'Fermer';
rscollection = 'Collection';
-rstabsheetcolorwheel = 'Color Wheel';
+rstabsheetcolorwheel = 'Roue des couleurs';
rsconfigurebookmarks = 'Configurer les signets';
rsconfirm = 'Confirmer';
rsconfirmation = 'Confirmation';
-rscontinuous = 'Continuous';
+rscontinuous = 'Continu';
rscopy = 'Copier';
rserrcouldnotopendir = 'Le répertoire <%s> n''''a pas pu être ouvert';
rscreate = 'Créer';
@@ -44,19 +46,19 @@ rscut = 'Couper';
rsdatabase = 'Base de données';
rsshortdec = 'Déc';
rslongdec = 'Décembre';
-rskeydel = 'Del';
+rskeydel = 'Suppr';
rsdelete = 'Supprimer';
rsdirectories = 'Répertoires';
rsdirectory = 'Répertoire';
-rskeydown = 'Down';
+rskeydown = 'Bas';
rsdrive = 'Disque';
rsedit = 'Editer';
-rskeyend = 'End';
+rskeyend = 'Fin';
rslanguage = 'Français';
-rskeyenter = 'Enter';
+rskeyenter = 'Entrée';
rsenternewdirectory = 'Entrer le nom du nouveau répertoire';
rserror = 'Erreur';
-rskeyesc = 'Esc';
+rskeyesc = 'Echap';
rsexampletext = 'Texte exemple';
rsexit = 'Sortir';
rserrfailedtocreatedir = 'Le répertoire <%s> n''''a pas pu être ouvert';
@@ -74,11 +76,13 @@ rscollectionfontaliases = 'Alias';
rserrreportfontfilemissing = 'Fichier de police <%s.fnt> non trouvé';
rsshortfri = 'Ven';
rslongfri = 'Vendredi';
-rscolorgreen = 'Green';
+rsgotoparentdirectory = 'Aller au répertoire parent';
+rsgotohomedirectory = 'Aller au répertoire origine';
+rscolorgreen = 'Vert';
rsfilegroup = 'Groupe';
rshelp = 'Aide';
-rshexadecimal = 'Hexadecimal';
-rskeyhome = 'Home';
+rshexadecimal = 'Hexadécimal';
+rskeyhome = 'Début';
rsignore = 'Ignorer';
rserrreportimagefilemissing = 'Image <%s> introuvable';
rsinformation = 'Information';
@@ -93,7 +97,7 @@ rsshortjul = 'Jul';
rslongjul = 'Juillet';
rsshortjun = 'Jun';
rslongjun = 'Juin';
-rskeyleft = 'Left';
+rskeyleft = 'Gauche';
rserrlistmustbeempty = 'La liste doit être vide';
rsshortmar = 'Mar';
rslongmar = 'Mars';
@@ -121,15 +125,15 @@ rsfiletypepdf = 'Documents PDF';
rsreportpage = 'Page';
rspassword = 'Mot de passe';
rspaste = 'Coller';
-rskeypgdn = 'PgDn';
-rskeypgup = 'PgUp';
-rstabpredefined = 'Predefined';
+rskeypgdn = 'PgBas';
+rskeypgup = 'PgHaut';
+rstabpredefined = 'Prédéfini';
rsreportpreview = 'Prévisualisation';
rscollectionrecentlyused = 'Récemment utilisé';
-rscolorred = 'Red';
+rscolorred = 'Rouge';
rsreplace = 'Remplacer';
rsretry = 'Retenter';
-rskeyright = 'Right';
+rskeyright = 'Droit';
rsfilerights = 'Droits';
rscollectionsans = 'Sans';
rsshortsat = 'Sam';
@@ -144,10 +148,10 @@ rsselectafont = 'Choisir la police';
rsshortsep = 'Sep';
rslongsep = 'Septembre';
rscollectionserif = 'Serif';
-rskeyshift = 'Shift+';
+rskeyshift = 'Maj+';
rsshowhidden = 'Montrer les fichiers cachés';
rssize = 'Taille';
-rskeyspace = 'Space';
+rskeyspace = 'Espace';
rsstyle = 'Style';
rsshortsun = 'Dim';
rslongsun = 'Dimanche';
@@ -163,7 +167,7 @@ rslongtue = 'Mardi';
rsfiletype = 'Type de fichier';
rstypeface = 'Style';
rsunderscore = 'Souligné';
-rskeyup = 'Up';
+rskeyup = 'Haut';
rsusername = 'Nom utilisateur';
rswarning = 'Alerte';
rsshortwed = 'Mer';
diff --git a/src/corelib/lang_it.inc b/src/corelib/lang_it.inc
index 26eb36d8..e1df75f4 100644
--- a/src/corelib/lang_it.inc
+++ b/src/corelib/lang_it.inc
@@ -12,6 +12,7 @@ rsall = 'Tutto';
rsallfiles = 'Tutti i Files';
rscollectionallfonts = 'Tutti i Fonts';
rskeyalt = 'Alt+';
+rserrunexpected = 'An unexpected error occurred.';
rsantialiasing = 'Anti aliasing';
rsshortapr = 'Apr';
rslongapr = 'Aprile';
@@ -21,6 +22,7 @@ rslongaug = 'Agosto';
rskeybksp = 'BkSp';
rscolorblue = 'Blue';
rsbold = 'Grassetto';
+rsbookmarks = 'Bookmarks';
rscancel = 'Annulla';
rscannotcreatedir = 'Non riesco a creare la cartella';
rschange = 'Cambia';
@@ -74,6 +76,8 @@ rscollectionfontaliases = 'Font Aliases';
rserrreportfontfilemissing = 'Font file <%s.fnt> not found';
rsshortfri = 'Ven';
rslongfri = 'Venerdì';
+rsgotoparentdirectory = 'Go to parent directory';
+rsgotohomedirectory = 'Got to home directory';
rscolorgreen = 'Green';
rsfilegroup = 'Gruppo';
rshelp = 'Aiuto';
diff --git a/src/corelib/lang_pt.inc b/src/corelib/lang_pt.inc
index fb3dd92b..718137e5 100644
--- a/src/corelib/lang_pt.inc
+++ b/src/corelib/lang_pt.inc
@@ -12,6 +12,7 @@ rsall = 'Todos';
rsallfiles = 'Todos os arquivos';
rscollectionallfonts = 'Todas Fontes';
rskeyalt = 'Alt+';
+rserrunexpected = 'An unexpected error occurred.';
rsantialiasing = 'Anti aliasing';
rsshortapr = 'Abr';
rslongapr = 'Abril';
@@ -21,6 +22,7 @@ rslongaug = 'Agosto';
rskeybksp = 'BkSp';
rscolorblue = 'Blue';
rsbold = 'Negrito';
+rsbookmarks = 'Bookmarks';
rscancel = 'Cancelar';
rscannotcreatedir = 'Não foi possível criar diretório';
rschange = 'Editar';
@@ -74,6 +76,8 @@ rscollectionfontaliases = 'Font Aliases';
rserrreportfontfilemissing = 'Font file <%s.fnt> not found';
rsshortfri = 'Sex';
rslongfri = 'Sexta-feira';
+rsgotoparentdirectory = 'Go to parent directory';
+rsgotohomedirectory = 'Got to home directory';
rscolorgreen = 'Green';
rsfilegroup = 'Grupo';
rshelp = 'Ajuda';
diff --git a/src/corelib/lang_ru.inc b/src/corelib/lang_ru.inc
index ce5b753e..d720842b 100644
--- a/src/corelib/lang_ru.inc
+++ b/src/corelib/lang_ru.inc
@@ -12,6 +12,7 @@ rsall = 'Все';
rsallfiles = 'Все файлы';
rscollectionallfonts = 'Все шрифты';
rskeyalt = 'Alt+';
+rserrunexpected = 'An unexpected error occurred.';
rsantialiasing = 'Сглаживание';
rsshortapr = 'Апр';
rslongapr = 'Апрель';
@@ -21,6 +22,7 @@ rslongaug = 'Август';
rskeybksp = 'BkSp';
rscolorblue = 'Синий';
rsbold = 'Жирный';
+rsbookmarks = 'Bookmarks';
rscancel = 'Отмена';
rscannotcreatedir = 'Невозможно создать директорию';
rschange = 'Изменить';
@@ -74,6 +76,8 @@ rscollectionfontaliases = 'Псевдонимы шрифтов';
rserrreportfontfilemissing = 'Файл шрифта <%s.fnt> не найден';
rsshortfri = 'Пт';
rslongfri = 'Пятница';
+rsgotoparentdirectory = 'Go to parent directory';
+rsgotohomedirectory = 'Got to home directory';
rscolorgreen = 'Green';
rsfilegroup = 'Группа';
rshelp = 'Справка';
diff --git a/src/corelib/render/software/Agg2D.pas b/src/corelib/render/software/Agg2D.pas
index b77b9ce9..7cf9cb48 100644
--- a/src/corelib/render/software/Agg2D.pas
+++ b/src/corelib/render/software/Agg2D.pas
@@ -644,7 +644,7 @@ type
function BitmapAlphaTransparency(bitmap : TfpgImage; alpha : byte ) : boolean;
function fpgColor2AggColor(c: TfpgColor): TAggColor;
-
+
IMPLEMENTATION
@@ -995,7 +995,6 @@ end;
function fpgColor2AggColor(c: TfpgColor): TAggColor;
var
t: TRGBTriple;
- c1: TfpgColor;
begin
t := fpgColorToRGBTriple(c);
Result.Construct(t.Red, t.Green, t.Blue, t.Alpha);
@@ -1137,7 +1136,7 @@ begin
stride );
{ OK }
- result:=true;
+ result:=true;
end;
@@ -3569,7 +3568,6 @@ end;
{$ENDIF}
{$IFDEF UNIX}
var
- s: TfpgString;
i: integer;
fnt: TFontCacheItem;
lSize: double;
@@ -3841,4 +3839,4 @@ end;
end.
-
+
diff --git a/src/corelib/render/software/agg_color.pas b/src/corelib/render/software/agg_color.pas
index 3aadb4f4..05958f8d 100644
--- a/src/corelib/render/software/agg_color.pas
+++ b/src/corelib/render/software/agg_color.pas
@@ -244,13 +244,12 @@ end;
{ FROM_WAVELENGTH }
constructor aggclr.from_wavelength(wl ,gamma : double );
var
- tr ,tg ,tb ,ta ,s : double;
+ tr ,tg ,tb ,s : double;
begin
tr:=0;
tg:=0;
tb:=0;
- ta:=0;
if (wl >= 380.0 ) and
(wl <= 440.0 ) then
diff --git a/src/corelib/render/software/agg_scanline_storage_aa.pas b/src/corelib/render/software/agg_scanline_storage_aa.pas
index 1f1f4ab4..b625f097 100644
--- a/src/corelib/render/software/agg_scanline_storage_aa.pas
+++ b/src/corelib/render/software/agg_scanline_storage_aa.pas
@@ -1671,9 +1671,6 @@ end;
{ REWIND_SCANLINES }
function serialized_scanlines_adaptor_aa.rewind_scanlines;
-var
- x : int;
-
begin
m_ptr:=m_data;
diff --git a/src/corelib/render/software/fpg_fontcache.pas b/src/corelib/render/software/fpg_fontcache.pas
index 15f65e40..3de3a7f6 100644
--- a/src/corelib/render/software/fpg_fontcache.pas
+++ b/src/corelib/render/software/fpg_fontcache.pas
@@ -207,7 +207,6 @@ function TFontCacheList.BuildFontCacheItem(const AFontFile: TfpgString): TFontCa
var
face_ptr: FT_Face_ptr;
s: Ansistring;
- i: integer;
flags: integer;
begin
FT_New_Face(m_library, PChar(AFontFile), 0, face_ptr);
diff --git a/src/corelib/x11/fpg_netlayer_x11.pas b/src/corelib/x11/fpg_netlayer_x11.pas
index eb9207b0..0ba60a6b 100644
--- a/src/corelib/x11/fpg_netlayer_x11.pas
+++ b/src/corelib/x11/fpg_netlayer_x11.pas
@@ -601,8 +601,6 @@ begin
end;
procedure TNETWindowLayer.WindowSetSupportPING(const AWindow: TWindow);
-var
- WM_PROTOCOLS: TAtom;
begin
//WM_PROTOCOLS := XInternAtom(FDisplay, 'WM_PROTOCOLS', True);
WindowAddProtocol(AWindow, FNetAtoms[naWM_PING]);
diff --git a/src/corelib/x11/fpg_x11.pas b/src/corelib/x11/fpg_x11.pas
index ff6e7272..3d28a873 100644
--- a/src/corelib/x11/fpg_x11.pas
+++ b/src/corelib/x11/fpg_x11.pas
@@ -704,7 +704,6 @@ var
Data: Pointer;
xia_Atom_Pair: TAtom;
AtomPair: TAtomPair;
- i: Integer;
r: cint;
begin
@@ -1689,7 +1688,7 @@ begin
OnIdle(self);
fpFD_ZERO(rfds);
fpFD_SET(xfd, rfds);
- r := fpSelect(xfd + 1, @rfds, nil, nil, Min(atimeoutms, 50));
+ r := fpSelect(xfd + 1, @rfds, nil, nil, 10);
if r <> 0 then // We got a X event or the timeout happened
XNextEvent(display, @ev)
else
diff --git a/src/corelib/x11/fpgui_toolkit.lpk b/src/corelib/x11/fpgui_toolkit.lpk
index f53dd62e..52454211 100644
--- a/src/corelib/x11/fpgui_toolkit.lpk
+++ b/src/corelib/x11/fpgui_toolkit.lpk
@@ -23,12 +23,11 @@
</CodeGeneration>
<Other>
<CustomOptions Value="-dAggCanvasX"/>
- <CompilerPath Value="$(CompPath)"/>
</Other>
</CompilerOptions>
<Description Value="fpGUI Toolkit"/>
<License Value="LGPL 2 with static linking exception."/>
- <Version Major="1" Minor="4"/>
+ <Version Major="1" Minor="4" Release="1"/>
<Files Count="110">
<Item1>
<Filename Value="../stdimages.inc"/>
generated by cgit v1.2.3-70-g09d2 (git 2.47.1) at 2024-12-26 18:15:25 +0000