[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk

Manal Alhassoun malhassoun at kacst.edu.sa
Wed Jan 1 11:23:10 PST 2014


 cui/UIConfig_cui.mk                                 |    1 
 cui/source/dialogs/cuigaldlg.cxx                    |    2 -
 cui/source/dialogs/gallery.src                      |    4 --
 cui/source/inc/gallery.hrc                          |    1 
 cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui |   34 ++++++++++++++++++++
 5 files changed, 36 insertions(+), 6 deletions(-)

New commits:
commit 2056f93f2d9f62741045e2aee0ed4d31001febef
Author: Manal Alhassoun <malhassoun at kacst.edu.sa>
Date:   Wed Jan 1 08:34:41 2014 +0300

    convert update file list queryboxes to .ui
    
    Change-Id: I9e9ad3674c6b45181b4fc3d4e252431b0dcab06d
    Reviewed-on: https://gerrit.libreoffice.org/7243
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index cde65d0..d059ad0 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -125,6 +125,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/querynoloadedfiledialog \
 	cui/uiconfig/ui/querynosavefiledialog \
 	cui/uiconfig/ui/querysavelistdialog \
+	cui/uiconfig/ui/queryupdategalleryfilelistdialog \
 	cui/uiconfig/ui/recordnumberdialog \
 	cui/uiconfig/ui/rotationtabpage \
 	cui/uiconfig/ui/scriptorganizer \
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ea9afc1..c3fba41 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -983,7 +983,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFileTypeHdl)
     {
         aLastFilterName = aText;
 
-        if( QueryBox( this, WB_YES_NO, OUString( CUI_RES( RID_SVXSTR_GALLERY_SEARCH ) ) ).Execute() == RET_YES )
+        if( MessageDialog( this, "QueryUpdateFileListDialog","cui/ui/queryupdategalleryfilelistdialog.ui" ).Execute() == RET_YES )
             SearchFiles();
     }
 
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index d1a7413..076b949 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -257,10 +257,6 @@ String RID_SVXSTR_GALLERY_NOFILES
 {
     Text [ en-US ] = "<No Files>" ;
 };
-String RID_SVXSTR_GALLERY_SEARCH
-{
-    Text [ en-US ] = "Do you want to update the file list?" ;
-};
 String RID_SVXSTR_GALLERYPROPS_OBJECT
 {
     Text [ en-US ] = "Object;Objects" ;
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index e255e75..d142711 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -28,7 +28,6 @@
 
 // Gallery-Strings
 #define RID_SVXSTR_GALLERY_NOFILES              (RID_CUI_GALLERY_START + 12)
-#define RID_SVXSTR_GALLERY_SEARCH               (RID_CUI_GALLERY_START + 30)
 #define RID_SVXSTR_GALLERYPROPS_OBJECT          (RID_CUI_GALLERY_START + 39)
 #define RID_SVXSTR_GALLERY_READONLY             (RID_CUI_GALLERY_START + 43)
 #define RID_SVXSTR_GALLERY_ALLFILES             (RID_CUI_GALLERY_START + 44)
diff --git a/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui
new file mode 100644
index 0000000..5dc0cac
--- /dev/null
+++ b/cui/uiconfig/ui/queryupdategalleryfilelistdialog.ui
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkMessageDialog" id="QueryUpdateFileListDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">12</property>
+    <property name="title" translatable="yes">Update the file list?</property>
+    <property name="resizable">False</property>
+    <property name="type_hint">dialog</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="message_type">question</property>
+    <property name="buttons">yes-no</property>
+    <property name="text" translatable="yes">Do you want to update the file list?</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="messagedialog-vbox4">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">24</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="messagedialog-action_area4">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>


More information about the Libreoffice-commits mailing list