RxFPC:compile with QT5

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5590 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/rx/trunk/languages/rxconst.es.po

@@ -39,10 +39,6 @@ msgstr "Izquierdo"
 msgid "Right"
 msgstr "Derecho"
 
-#: rxconst.scarbonwidgetset
-msgid "Carbon widget set"
-msgstr ""
-
 #: rxconst.scloseallexceptthis
 msgid "Close all except this"
 msgstr ""
@@ -115,22 +111,10 @@ msgstr ""
 msgid "FPC version : "
 msgstr ""
 
-#: rxconst.sfpguiwidgetset
-msgid "FpGUI widget set"
-msgstr ""
-
 #: rxconst.sgeneral
 msgid "General"
 msgstr ""
 
-#: rxconst.sgtk2widgetset
-msgid "GTK 2 widget set"
-msgstr ""
-
-#: rxconst.sgtkwidgetset
-msgid "GTK widget set"
-msgstr ""
-
 #: rxconst.shistorydesc
 msgid "History - \"%s\""
 msgstr ""
@@ -163,10 +147,6 @@ msgstr "Funcion no esta aun implementada"
 msgid "Options"
 msgstr "Opciones"
 
-#: rxconst.sotherguiwidgetset
-msgid "Other gui"
-msgstr ""
-
 #: rxconst.soutofrange
 msgid "Out of range %d %d %d %d"
 msgstr ""
@@ -179,10 +159,6 @@ msgstr "Anterior Mes|"
 msgid "Previous Year|"
 msgstr "Anterior A?o|"
 
-#: rxconst.sqtwidgetset
-msgid "QT widget set"
-msgstr ""
-
 #: rxconst.sreqvalue
 msgid "Error. Expected value for field %s."
 msgstr ""
@@ -269,12 +245,8 @@ msgstr ""
 msgid "Visible buttons"
 msgstr "Botones visibles"
 
-#: rxconst.swin32_64widgetset
+#: rxconst.swidget
-msgid "Win32/Win64 widget set"
+msgid "Widget : "
-msgstr ""
-
-#: rxconst.swincewidgetset
-msgid "WinCE widget set"
 msgstr ""
 
 #: rxconst.swindowsicofiles

components/rx/trunk/languages/rxconst.po

@@ -37,10 +37,6 @@ msgstr ""
 msgid "Right"
 msgstr ""
 
-#: rxconst.scarbonwidgetset
-msgid "Carbon widget set"
-msgstr ""
-
 #: rxconst.scloseallexceptthis
 msgid "Close all except this"
 msgstr ""
@@ -113,22 +109,10 @@ msgstr ""
 msgid "FPC version : "
 msgstr ""
 
-#: rxconst.sfpguiwidgetset
-msgid "FpGUI widget set"
-msgstr ""
-
 #: rxconst.sgeneral
 msgid "General"
 msgstr ""
 
-#: rxconst.sgtk2widgetset
-msgid "GTK 2 widget set"
-msgstr ""
-
-#: rxconst.sgtkwidgetset
-msgid "GTK widget set"
-msgstr ""
-
 #: rxconst.shistorydesc
 msgid "History - \"%s\""
 msgstr ""
@@ -161,10 +145,6 @@ msgstr ""
 msgid "Options"
 msgstr ""
 
-#: rxconst.sotherguiwidgetset
-msgid "Other gui"
-msgstr ""
-
 #: rxconst.soutofrange
 msgid "Out of range %d %d %d %d"
 msgstr ""
@@ -177,10 +157,6 @@ msgstr ""
 msgid "Previous Year|"
 msgstr ""
 
-#: rxconst.sqtwidgetset
-msgid "QT widget set"
-msgstr ""
-
 #: rxconst.sreqvalue
 msgid "Error. Expected value for field %s."
 msgstr ""
@@ -265,12 +241,8 @@ msgstr ""
 msgid "Visible buttons"
 msgstr ""
 
-#: rxconst.swin32_64widgetset
+#: rxconst.swidget
-msgid "Win32/Win64 widget set"
+msgid "Widget : "
-msgstr ""
-
-#: rxconst.swincewidgetset
-msgid "WinCE widget set"
 msgstr ""
 
 #: rxconst.swindowsicofiles

components/rx/trunk/languages/rxconst.ru.po

@@ -37,10 +37,6 @@ msgstr "Влево"
 msgid "Right"
 msgstr "Вправо"
 
-#: rxconst.scarbonwidgetset
-msgid "Carbon widget set"
-msgstr "Графический интерфейс Carbon"
-
 #: rxconst.scloseallexceptthis
 msgid "Close all except this"
 msgstr "Закрыть все окна, за исключением этого"
@@ -113,22 +109,10 @@ msgstr "Четвёртый квартал"
 msgid "FPC version : "
 msgstr "Версия FPC : "
 
-#: rxconst.sfpguiwidgetset
-msgid "FpGUI widget set"
-msgstr "Графический интерфейс FpGUI"
-
 #: rxconst.sgeneral
 msgid "General"
 msgstr "Общее"
 
-#: rxconst.sgtk2widgetset
-msgid "GTK 2 widget set"
-msgstr "Графический интерфейс GTK 2"
-
-#: rxconst.sgtkwidgetset
-msgid "GTK widget set"
-msgstr "Графический интерфейс GTK"
-
 #: rxconst.shistorydesc
 msgid "History - \"%s\""
 msgstr "История - \"%s\""
@@ -161,10 +145,6 @@ msgstr "Функция не реализована"
 msgid "Options"
 msgstr "Параметры"
 
-#: rxconst.sotherguiwidgetset
-msgid "Other gui"
-msgstr "Неизвестный графический интерфейс"
-
 #: rxconst.soutofrange
 msgid "Out of range %d %d %d %d"
 msgstr "За границами диапазона %d %d %d %d"
@@ -177,10 +157,6 @@ msgstr "Превыдущий месяц|"
 msgid "Previous Year|"
 msgstr "Превыдущий год|"
 
-#: rxconst.sqtwidgetset
-msgid "QT widget set"
-msgstr "Графический интерфейс QT"
-
 #: rxconst.sreqvalue
 msgid "Error. Expected value for field %s."
 msgstr "Поле %s. Требуется значение"
@@ -265,13 +241,9 @@ msgstr ""
 msgid "Visible buttons"
 msgstr "Отображаемые кнопки"
 
-#: rxconst.swin32_64widgetset
+#: rxconst.swidget
-msgid "Win32/Win64 widget set"
+msgid "Widget : "
-msgstr "Графический интерфейс Win32/Win64"
+msgstr "Интерфейс : "
-
-#: rxconst.swincewidgetset
-msgid "WinCE widget set"
-msgstr "Графический интерфейс WinCE"
 
 #: rxconst.swindowsicofiles
 msgid "Windows Ico files (*.ico)|*.ico|All files (*.*)|*.*"

components/rx/trunk/languages/rxconst.uk.po

@@ -48,10 +48,6 @@ msgstr "Ліворуч"
 msgid "Right"
 msgstr "Праворуч"
 
-#: rxconst.scarbonwidgetset
-msgid "Carbon widget set"
-msgstr "Графічний інтерфейс Carbon"
-
 #: rxconst.scloseallexceptthis
 msgid "Close all except this"
 msgstr "Закрити всі вікна, за виключенням цього"
@@ -126,22 +122,10 @@ msgstr ""
 msgid "FPC version : "
 msgstr "Версія FPC : "
 
-#: rxconst.sfpguiwidgetset
-msgid "FpGUI widget set"
-msgstr "Набір віджетів FpGUI"
-
 #: rxconst.sgeneral
 msgid "General"
 msgstr "Загальне"
 
-#: rxconst.sgtk2widgetset
-msgid "GTK 2 widget set"
-msgstr "Набір віджетів GTK 2"
-
-#: rxconst.sgtkwidgetset
-msgid "GTK widget set"
-msgstr "Набір віджетів GTK"
-
 #: rxconst.shistorydesc
 msgid "History - \"%s\""
 msgstr "Історія - \"%s\""
@@ -174,10 +158,6 @@ msgstr "Функція не реалізована"
 msgid "Options"
 msgstr "Параметри"
 
-#: rxconst.sotherguiwidgetset
-msgid "Other gui"
-msgstr "Інші GUI"
-
 #: rxconst.soutofrange
 msgid "Out of range %d %d %d %d"
 msgstr ""
@@ -190,10 +170,6 @@ msgstr "Попередній місяць|"
 msgid "Previous Year|"
 msgstr "Попередній місяць|"
 
-#: rxconst.sqtwidgetset
-msgid "QT widget set"
-msgstr "Набір віджетів QT"
-
 #: rxconst.sreqvalue
 #, fuzzy
 #| msgid "Error. Expected value for filed %s."
@@ -282,13 +258,9 @@ msgstr ""
 msgid "Visible buttons"
 msgstr "Видимі кнопки"
 
-#: rxconst.swin32_64widgetset
+#: rxconst.swidget
-msgid "Win32/Win64 widget set"
+msgid "Widget : "
-msgstr "Набір віджетів Win32/Win64"
+msgstr ""
-
-#: rxconst.swincewidgetset
-msgid "WinCE widget set"
-msgstr "Набір віджетів WinCE"
 
 #: rxconst.swindowsicofiles
 msgid "Windows Ico files (*.ico)|*.ico|All files (*.*)|*.*"

components/rx/trunk/rxaboutformunit.lfm

@@ -8,20 +8,20 @@ object rxAboutFormForm: TrxAboutFormForm
   ClientWidth = 498
   OnCreate = FormCreate
   Position = poScreenCenter
-  LCLVersion = '0.9.29'
+  LCLVersion = '1.7'
   object PageControl1: TPageControl
     Left = 0
-    Height = 340
+    Height = 328
     Top = 0
     Width = 498
-    ActivePage = TabSheet1
+    ActivePage = TabSheet2
     Align = alClient
-    TabIndex = 0
+    TabIndex = 1
     TabOrder = 0
     object TabSheet1: TTabSheet
       Caption = 'General'
-      ClientHeight = 314
+      ClientHeight = 294
-      ClientWidth = 490
+      ClientWidth = 488
       object lblAppTitle: TLabel
         AnchorSideLeft.Control = Image1
         AnchorSideLeft.Side = asrBottom
@@ -29,9 +29,9 @@ object rxAboutFormForm: TrxAboutFormForm
         AnchorSideRight.Control = TabSheet1
         AnchorSideRight.Side = asrBottom
         Left = 140
-        Height = 14
+        Height = 20
         Top = 6
-        Width = 344
+        Width = 342
         Alignment = taCenter
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Around = 6
@@ -56,9 +56,9 @@ object rxAboutFormForm: TrxAboutFormForm
         AnchorSideRight.Control = lblAppTitle
         AnchorSideRight.Side = asrBottom
         Left = 140
-        Height = 14
+        Height = 20
-        Top = 27
+        Top = 33
-        Width = 344
+        Width = 342
         Alignment = taCenter
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 7
@@ -75,9 +75,9 @@ object rxAboutFormForm: TrxAboutFormForm
         AnchorSideBottom.Control = TabSheet1
         AnchorSideBottom.Side = asrBottom
         Left = 140
-        Height = 273
+        Height = 241
-        Top = 41
+        Top = 53
-        Width = 350
+        Width = 348
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderStyle = bsNone
         ParentColor = True
@@ -88,16 +88,16 @@ object rxAboutFormForm: TrxAboutFormForm
     end
     object TabSheet2: TTabSheet
       Caption = 'Detail'
-      ClientHeight = 314
+      ClientHeight = 294
-      ClientWidth = 490
+      ClientWidth = 488
       object lblBuildDate: TLabel
         AnchorSideLeft.Control = TabSheet2
         AnchorSideRight.Control = TabSheet2
         AnchorSideRight.Side = asrBottom
         Left = 0
-        Height = 14
+        Height = 20
         Top = 6
-        Width = 490
+        Width = 488
         Alignment = taCenter
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 6
@@ -111,9 +111,9 @@ object rxAboutFormForm: TrxAboutFormForm
         AnchorSideRight.Control = TabSheet2
         AnchorSideRight.Side = asrBottom
         Left = 0
-        Height = 14
+        Height = 20
-        Top = 26
+        Top = 32
-        Width = 490
+        Width = 488
         Alignment = taCenter
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 6
@@ -127,9 +127,9 @@ object rxAboutFormForm: TrxAboutFormForm
         AnchorSideRight.Control = TabSheet2
         AnchorSideRight.Side = asrBottom
         Left = 0
-        Height = 14
+        Height = 20
-        Top = 46
+        Top = 58
-        Width = 490
+        Width = 488
         Alignment = taCenter
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 6
@@ -143,9 +143,9 @@ object rxAboutFormForm: TrxAboutFormForm
         AnchorSideRight.Control = TabSheet2
         AnchorSideRight.Side = asrBottom
         Left = 0
-        Height = 14
+        Height = 20
-        Top = 66
+        Top = 84
-        Width = 490
+        Width = 488
         Alignment = taCenter
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 6
@@ -159,9 +159,9 @@ object rxAboutFormForm: TrxAboutFormForm
         AnchorSideRight.Control = TabSheet2
         AnchorSideRight.Side = asrBottom
         Left = 0
-        Height = 14
+        Height = 20
-        Top = 86
+        Top = 110
-        Width = 490
+        Width = 488
         Alignment = taCenter
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 6
@@ -175,9 +175,9 @@ object rxAboutFormForm: TrxAboutFormForm
         AnchorSideRight.Control = TabSheet2
         AnchorSideRight.Side = asrBottom
         Left = 0
-        Height = 14
+        Height = 20
-        Top = 106
+        Top = 136
-        Width = 490
+        Width = 488
         Alignment = taCenter
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Top = 6
@@ -187,13 +187,13 @@ object rxAboutFormForm: TrxAboutFormForm
     end
     object TabSheet3: TTabSheet
       Caption = 'License'
-      ClientHeight = 301
+      ClientHeight = 294
-      ClientWidth = 494
+      ClientWidth = 488
       object Memo1: TMemo
         Left = 0
-        Height = 301
+        Height = 294
         Top = 0
-        Width = 494
+        Width = 488
         Align = alClient
         Lines.Strings = (
           'Memo1'
@@ -204,14 +204,22 @@ object rxAboutFormForm: TrxAboutFormForm
   end
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 34
+    Height = 46
-    Top = 346
+    Top = 334
     Width = 486
+    OKButton.Name = 'OKButton'
+    OKButton.DefaultCaption = True
+    HelpButton.Name = 'HelpButton'
+    HelpButton.DefaultCaption = True
+    CloseButton.Name = 'CloseButton'
+    CloseButton.DefaultCaption = True
+    CancelButton.Name = 'CancelButton'
+    CancelButton.DefaultCaption = True
     TabOrder = 1
     ShowButtons = [pbClose, pbHelp]
   end
   object RxVersionInfo1: TRxVersionInfo
-    left = 432
+    Left = 432
-    top = 88
+    Top = 88
   end
 end

components/rx/trunk/rxconst.pas

@@ -77,14 +77,15 @@ resourcestring
   sButtonAlign1         = 'None';
   sButtonAlign2         = 'Left';
   sButtonAlign3         = 'Right';
-  sGTKWidgetSet         = 'GTK widget set';
+//  sGTKWidgetSet         = 'GTK widget set';
-  sGTK2WidgetSet        = 'GTK 2 widget set';
+//  sGTK2WidgetSet        = 'GTK 2 widget set';
-  sWin32_64WidgetSet    = 'Win32/Win64 widget set';
+//  sWin32_64WidgetSet    = 'Win32/Win64 widget set';
-  sWinCEWidgetSet       = 'WinCE widget set';
+//  sWinCEWidgetSet       = 'WinCE widget set';
-  sCarbonWidgetSet      = 'Carbon widget set';
+//  sCarbonWidgetSet      = 'Carbon widget set';
-  sQTWidgetSet          = 'QT widget set';
+//  sQTWidgetSet          = 'QT widget set';
-  sFpGUIWidgetSet       = 'FpGUI widget set';
+//  sFpGUIWidgetSet       = 'FpGUI widget set';
-  sOtherGUIWidgetSet    = 'Other gui';
+//  sOtherGUIWidgetSet    = 'Other gui';
+  sWidget               = 'Widget : ';
   sAppVersion           = 'Version : ';
   sLCLVersion           = 'LCL Version: ';
   sFpcVersion           = 'FPC version : ';

components/rx/trunk/rxversinfo.pas

@@ -306,7 +306,8 @@ end;
 
 function TRxVersionInfo.GetWidgetName: string;
 begin
-  case WidgetSet.LCLPlatform of
+  Result:=sWidget + LCLPlatformDisplayNames[WidgetSet.LCLPlatform];
+{  case WidgetSet.LCLPlatform of
     lpGtk:Result:=sGTKWidgetSet;
     lpGtk2:Result:=sGTK2WidgetSet;
     lpWin32:Result:=sWin32_64WidgetSet;
@@ -316,7 +317,7 @@ begin
     lpfpGUI:Result:=sFpGUIWidgetSet;
   else
     Result:=sOtherGUIWidgetSet;
-  end;
+  end;}
 end;
 
 end.