convert DLG_SYNC_BTN FloatingWindow to .ui

not much of a test, its just a single button

Change-Id: I42f73ad0ad00e2af392bc6ab8bc827c3719b0304

sw/UIConfig_swriter.mk

@@ -112,6 +112,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/fldfuncpage \
 	sw/uiconfig/swriter/ui/fldrefpage \
 	sw/uiconfig/swriter/ui/fldvarpage \
+	sw/uiconfig/swriter/ui/floatingsync \
 	sw/uiconfig/swriter/ui/formatsectiondialog \
 	sw/uiconfig/swriter/ui/formattablepage \
 	sw/uiconfig/swriter/ui/footendnotedialog \

sw/inc/envelp.hrc

@@ -26,8 +26,6 @@
 
 #define DLG_MAILMERGE (RC_ENVELP_BEGIN + 8)
 
-#define DLG_SYNC_BTN  (RC_ENVELP_BEGIN + 9)
-
 // Bereiche -------------------------------------------------------------------
 
 #define RC_ENVLOP_BEGIN  (RC_ENVELP_BEGIN     )

sw/inc/helpid.h

@@ -116,7 +116,6 @@
 #define HID_SORT_DATE                                           "SW_HID_SORT_DATE"
 #define HID_SORT_COMMENT                                        "SW_HID_SORT_COMMENT"
 #define HID_SW_SORT_POSITION                                    "SW_HID_SW_SORT_POSITION"
-#define HID_SYNC_BTN                                            "SW_HID_SYNC_BTN"
 #define HID_EDIT_COMMENT                                        "SW_HID_EDIT_COMMENT"
 #define HID_DLG_FLDEDT_NEXT                                     "SW_HID_DLG_FLDEDT_NEXT"
 #define HID_DLG_FLDEDT_PREV                                     "SW_HID_DLG_FLDEDT_PREV"

sw/source/ui/envelp/label.src

@@ -21,27 +21,6 @@
 #include "globals.hrc"
 #include "helpid.h"
 
-#define WIDTH  100
-#define HEIGHT 16
-FloatingWindow DLG_SYNC_BTN
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( WIDTH , HEIGHT ) ;
-    Moveable = TRUE ;
-    Closeable = FALSE ;
-    Sizeable = FALSE ;
-    Zoomable = TRUE ;
-    HelpID = HID_SYNC_BTN ;
-    Hide = TRUE ;
-    PushButton BTN_SYNC
-    {
-        HelpID = "sw:PushButton:DLG_SYNC_BTN:BTN_SYNC";
-        Pos = MAP_APPFONT ( 1 , 1 ) ;
-        Size = MAP_APPFONT ( WIDTH - 1 , HEIGHT - 1 ) ;
-        Text [ en-US ] = "Synchronize Labels" ;
-    };
-};
 String STR_CUSTOM
 {
     Text [ en-US ] = "[User]";

sw/source/uibase/envelp/label.hrc

@@ -22,10 +22,6 @@
 
 #include "envelp.hrc"
 
-// local resources *********************************************************
-
-#define BTN_SYNC     20
-
 // global resources ********************************************************
 #define STR_CUSTOM              (RC_LABEL_BEGIN + 1)
 

sw/source/uibase/envelp/syncbtn.cxx

@@ -26,7 +26,6 @@
 #include "edtwin.hxx"
 #include "label.hrc"
 
-#define _SYNCDLG
 #include "syncbtn.hxx"
 #include "swtypes.hxx"
 
@@ -61,16 +60,13 @@ SwSyncChildWin::SwSyncChildWin( Window* _pParent,
 
 SwSyncBtnDlg::SwSyncBtnDlg( SfxBindings* _pBindings,
                             SfxChildWindow* pChild,
-                            Window *pParent) :
-    SfxFloatingWindow(_pBindings, pChild, pParent, SW_RES(DLG_SYNC_BTN)),
-    aSyncBtn        (this, SW_RES(BTN_SYNC ))
-{
-    FreeResource();
-    aSyncBtn.SetClickHdl(LINK(this, SwSyncBtnDlg, BtnHdl));
-}
-
-SwSyncBtnDlg::~SwSyncBtnDlg()
+                            Window *pParent)
+    : SfxFloatingWindow(_pBindings, pChild, pParent, "FloatingSync", "modules/swriter/ui/floatingsync.ui")
 {
+    get(m_pSyncBtn, "sync");
+    m_pSyncBtn->SetClickHdl(LINK(this, SwSyncBtnDlg, BtnHdl));
+    fprintf(stderr, "SwSyncBtnDlg::SwSyncBtnDlg %p\n", this);
+    Show();
 }
 
 IMPL_LINK_NOARG(SwSyncBtnDlg, BtnHdl)

sw/source/uibase/inc/syncbtn.hxx

@@ -18,24 +18,20 @@
  */
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SYNCBTN_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_SYNCBTN_HXX
-#include <sfx2/childwin.hxx>
 
-#ifdef _SYNCDLG
 #include <sfx2/basedlgs.hxx>
-
+#include <sfx2/childwin.hxx>
 #include <vcl/button.hxx>
 
 class SwSyncBtnDlg : public SfxFloatingWindow
 {
-    PushButton              aSyncBtn;
+    PushButton* m_pSyncBtn;
 
     DECL_LINK( BtnHdl, void* );
 
 public:
     SwSyncBtnDlg(SfxBindings*, SfxChildWindow*, Window *pParent);
-    virtual ~SwSyncBtnDlg();
 };
-#endif
 
 class SwSyncChildWin : public SfxChildWindow
 {

sw/uiconfig/swriter/ui/floatingsync.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
+<interface>
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkWindow" id="FloatingSync">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="no_show_all">True</property>
+    <property name="border_width">6</property>
+    <property name="title" translatable="yes">Synchronize</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">utility</property>
+    <property name="deletable">False</property>
+    <child>
+      <object class="GtkBox" id="box1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="vexpand">True</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkButton" id="sync">
+            <property name="label" translatable="yes">Synchronize Labels</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="can_default">True</property>
+            <property name="has_default">True</property>
+            <property name="receives_default">True</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>