[Libreoffice-commits] .: 3 commits - sfx2/inc sfx2/source

[Rafael Dominguez]

 sfx2/inc/templatedlg.hxx        |    2 +-
 sfx2/source/doc/templatedlg.cxx |    9 +++++----
 sfx2/source/doc/templatedlg.src |   10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 86f7066c0921df5d9fa2a1d4c07b175fb0fb49c9
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Mon Jul 16 21:55:20 2012 -0430

    Display correct view when searching and position online view below box.
    
    Change-Id: Ib58a48c3cbd8aaba38f053bf0a646d6c267f7909

diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 9017f09..4add070 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -604,7 +604,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
     {
         mpSearchView->Clear();
         mpSearchView->Show();
-        maView->Hide();
+        mpCurView->Hide();
     }
 
     rtl::OUString aKeyword = mpSearchEdit->GetText();
@@ -634,7 +634,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, SearchUpdateHdl)
     else
     {
         mpSearchView->Hide();
-        maView->Show();
+        mpCurView->Show();
     }
 
     return 0;
@@ -741,6 +741,7 @@ void SfxTemplateManagerDlg::OnTemplateSearch ()
 
     SetSizePixel(aWinSize);
     maView->SetPosPixel(aPos);
+    mpOnlineView->SetPosPixel(aPos);
     mpSearchView->SetPosPixel(aPos);
     maButtonClose.SetPosPixel(aClosePos);
 
@@ -748,7 +749,7 @@ void SfxTemplateManagerDlg::OnTemplateSearch ()
     if (bVisible)
     {
         mpSearchView->Hide();
-        maView->Show();
+        mpCurView->Show();
     }
 
     mpSearchEdit->Show(!bVisible);
commit 8d1e1177bd41f342d934f3ef47018a4651a390d5
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Mon Jul 16 18:44:07 2012 -0430

    Make command names shorter.
    
    Change-Id: I2e258ad84aafd17121f86bdc8b8b1aa24b24e709

diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 44a48e4..cb73de0 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -177,7 +177,7 @@ ModelessDialog DLG_TEMPLATE_MANAGER
             ToolBoxItem
             {
                 Identifier = TBI_TEMPLATE_CREATE;
-                Text [ en-US ] = "Create a template" ;
+                Text [ en-US ] = "Create" ;
 
                 ItemImage = Image
                 {
@@ -188,19 +188,19 @@ ModelessDialog DLG_TEMPLATE_MANAGER
             ToolBoxItem
             {
                 Identifier = TBI_TEMPLATE_LOCAL;
-                Text [ en-US ] = "Local Templates";
+                Text [ en-US ] = "Local";
             };
 
             ToolBoxItem
             {
                 Identifier = TBI_TEMPLATE_ONLINE;
-                Text [ en-US ] = "Online Templates";
+                Text [ en-US ] = "Online";
             };
 
             ToolBoxItem
             {
                 Identifier = TBI_TEMPLATE_IMPORT ;
-                Text [ en-US ] = "Import a template" ;
+                Text [ en-US ] = "Import" ;
 
                 ItemImage = Image
                 {
commit 82dad7f68ab05e55cc2e7e0f27026419e04e0622
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Sun Jul 15 12:16:02 2012 -0430

    Make TemplateDialog modeless.
    
    Change-Id: I71f923112e932b9cbee9f084581b7a5cdd878510

diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 47e6f9b..23fd9a4 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -31,7 +31,7 @@ namespace com {
     }   }   }
 }
 
-class SfxTemplateManagerDlg : public ModalDialog
+class SfxTemplateManagerDlg : public ModelessDialog
 {
 public:
 
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 05d333b..9017f09 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -84,7 +84,7 @@ private:
 };
 
 SfxTemplateManagerDlg::SfxTemplateManagerDlg (Window *parent)
-    : ModalDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
+    : ModelessDialog(parent, SfxResId(DLG_TEMPLATE_MANAGER)),
       aButtonAll(this,SfxResId(BTN_SELECT_ALL)),
       aButtonDocs(this,SfxResId(BTN_SELECT_DOCS)),
       aButtonPresents(this,SfxResId(BTN_SELECT_PRESENTATIONS)),
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index 2681200..44a48e4 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -45,7 +45,7 @@ String STR_INPUT_NEW
     Text [ en-US ] = "Enter folder name:";
 };
 
-ModalDialog DLG_TEMPLATE_MANAGER
+ModelessDialog DLG_TEMPLATE_MANAGER
 {
     HelpId = CMD_SID_TEMPLATE_MANAGER;
     OutputSize = TRUE;