[Libreoffice-commits] .: toolkit/source toolkit/uiconfig toolkit/workben

Matus Kukan mkukan at kemper.freedesktop.org
Fri May 20 13:21:59 PDT 2011


 toolkit/source/awt/vclxbutton.cxx       |   22 +++++++++++-----------
 toolkit/uiconfig/layout/message-box.xml |    8 ++++----
 toolkit/workben/layout/editor.cxx       |   10 +++++-----
 toolkit/workben/layout/message-box.xml  |    8 ++++----
 toolkit/workben/layout/plugin.xml       |    2 +-
 toolkit/workben/layout/recover.xml      |   10 +++++-----
 6 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit b3c45ab06c4d29161c006f57e6fc8934844ac808
Author: Matus Kukan <matus.kukan at gmail.com>
Date:   Fri May 20 19:09:51 2011 +0200

    replace res/commandimagelist with cmd in toolkit

diff --git a/toolkit/source/awt/vclxbutton.cxx b/toolkit/source/awt/vclxbutton.cxx
index aa8f5c3..0e5c416 100644
--- a/toolkit/source/awt/vclxbutton.cxx
+++ b/toolkit/source/awt/vclxbutton.cxx
@@ -57,70 +57,70 @@ VCLXIconButton::VCLXIconButton( Window *p, rtl::OUString aDefaultLabel, char con
 
 VCLXOKButton::VCLXOKButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_OK ),
-                         "res/commandimagelist/sc_ok.png" )
+                         "cmd/sc_ok.png" )
 {
 }
 
 VCLXCancelButton::VCLXCancelButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_CANCEL ),
 //    : VCLXIconButton( xButton, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Cancel ")),
-                         "res/commandimagelist/sc_cancel.png" )
+                         "cmd/sc_cancel.png" )
 {
 }
 
 VCLXYesButton::VCLXYesButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_YES ),
-                  "res/commandimagelist/sc_yes.png" )
+                  "cmd/sc_yes.png" )
 {
 }
 
 VCLXNoButton::VCLXNoButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_NO ),
-                  "res/commandimagelist/sc_no.png" )
+                  "cmd/sc_no.png" )
 {
 }
 
 VCLXRetryButton::VCLXRetryButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_RETRY ),
-                  "res/commandimagelist/sc_retry.png" )
+                  "cmd/sc_retry.png" )
 {
 }
 
 VCLXIgnoreButton::VCLXIgnoreButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_IGNORE ),
-                  "res/commandimagelist/sc_ignore.png" )
+                  "cmd/sc_ignore.png" )
 {
 }
 
 VCLXResetButton::VCLXResetButton( Window *p )
     : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("~Reset ")),
-                  "res/commandimagelist/sc_reset.png" )
+                  "cmd/sc_reset.png" )
 {
 }
 
 VCLXApplyButton::VCLXApplyButton( Window *p )
     : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Apply")),
-                  "res/commandimagelist/sc_apply.png" )
+                  "cmd/sc_apply.png" )
 {
 }
 
 VCLXHelpButton::VCLXHelpButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_HELP ),
-                  "res/commandimagelist/sc_help.png" )
+                  "cmd/sc_help.png" )
 {
 }
 
 VCLXMoreButton::VCLXMoreButton( Window *p )
     : VCLXIconButton( p, Button::GetStandardText( BUTTON_MORE ),
 //    : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("More ")),
-                  "res/commandimagelist/sc_more.png" )
+                  "cmd/sc_more.png" )
 {
 }
 
 VCLXAdvancedButton::VCLXAdvancedButton( Window *p )
 //    : VCLXIconButton( p, Button::GetStandardText( BUTTON_ADVANCED ),
     : VCLXIconButton( p, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Advanced ")),
-                  "res/commandimagelist/sc_advanced.png" )
+                  "cmd/sc_advanced.png" )
 {
 }
 
diff --git a/toolkit/uiconfig/layout/message-box.xml b/toolkit/uiconfig/layout/message-box.xml
index 61305e4..2bd19bb 100644
--- a/toolkit/uiconfig/layout/message-box.xml
+++ b/toolkit/uiconfig/layout/message-box.xml
@@ -10,16 +10,16 @@
     <vbox border="5" spacing="5">
     <hbox border="5" spacing="20">
         <align cnt:expand="false" cnt:fill="true">
-        <fixedimage id="FI_ERROR" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-error.png" />
+        <fixedimage id="FI_ERROR" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="cmd/msgbox-error.png" />
         </align>
         <align cnt:expand="false" cnt:fill="true">
-        <fixedimage id="FI_INFO" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-info.png" />
+        <fixedimage id="FI_INFO" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="cmd/msgbox-info.png" />
         </align>
         <align cnt:expand="false" cnt:fill="true">
-        <fixedimage id="FI_QUERY" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-query.png" />
+        <fixedimage id="FI_QUERY" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="cmd/msgbox-query.png" />
         </align>
         <align cnt:expand="false" cnt:fill="true">
-        <fixedimage id="FI_WARNING" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-warning.png" />
+        <fixedimage id="FI_WARNING" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="cmd/msgbox-warning.png" />
         </align>
         <align cnt:expand="false" cnt:fill="true">
         <fixedtext id="FT_MESSAGE" _label="FT-LABEL" cnt:v-align="0.5" cnt:v-fill="0" />
diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
index 4b41ded..34f35c6 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.cxx
@@ -1329,16 +1329,16 @@ public:
     {
         mpListBox->SetSelectHdl( LINK( this, SortListBox, ItemSelectedHdl ) );
 
-        mpUpButton->SetModeImage( layout::Image ( "res/commandimagelist/lc_moveup.png" ) );
+        mpUpButton->SetModeImage( layout::Image ( "cmd/lc_moveup.png" ) );
         mpUpButton->SetImageAlign( IMAGEALIGN_LEFT );
         mpUpButton->SetClickHdl( LINK( this, SortListBox, UpPressedHdl ) );
 
-        mpDownButton->SetModeImage( layout::Image ( "res/commandimagelist/lc_movedown.png" ) );
+        mpDownButton->SetModeImage( layout::Image ( "cmd/lc_movedown.png" ) );
         mpDownButton->SetImageAlign( IMAGEALIGN_LEFT );
         mpDownButton->SetClickHdl( LINK( this, SortListBox, DownPressedHdl ) );
 
-        // "res/commandimagelist/lch_delete.png", "res/commandimagelist/lc_delete.png"
-        mpRemoveButton->SetModeImage( layout::Image ( "res/commandimagelist/sc_closedoc.png" ) );
+        // "cmd/lch_delete.png", "cmd/lc_delete.png"
+        mpRemoveButton->SetModeImage( layout::Image ( "cmd/sc_closedoc.png" ) );
         mpRemoveButton->SetImageAlign( IMAGEALIGN_LEFT );
         mpRemoveButton->SetClickHdl( LINK( this, SortListBox, RemovePressedHdl ) );
 
@@ -1659,7 +1659,7 @@ EditorImpl::EditorImpl( layout::Dialog *dialog,
         pBtn->SetClickHdl( LINK( this, EditorImpl, CreateWidgetHdl ) );
         if ( WIDGETS_SPECS[ i ].pIconName != NULL )
         {
-            rtl::OString aPath ("res/commandimagelist/");
+            rtl::OString aPath ("cmd/");
             aPath += WIDGETS_SPECS[ i ].pIconName;
             layout::Image aImg( aPath );
             pBtn->SetModeImage( aImg );
diff --git a/toolkit/workben/layout/message-box.xml b/toolkit/workben/layout/message-box.xml
index 61305e4..2bd19bb 100644
--- a/toolkit/workben/layout/message-box.xml
+++ b/toolkit/workben/layout/message-box.xml
@@ -10,16 +10,16 @@
     <vbox border="5" spacing="5">
     <hbox border="5" spacing="20">
         <align cnt:expand="false" cnt:fill="true">
-        <fixedimage id="FI_ERROR" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-error.png" />
+        <fixedimage id="FI_ERROR" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="cmd/msgbox-error.png" />
         </align>
         <align cnt:expand="false" cnt:fill="true">
-        <fixedimage id="FI_INFO" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-info.png" />
+        <fixedimage id="FI_INFO" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="cmd/msgbox-info.png" />
         </align>
         <align cnt:expand="false" cnt:fill="true">
-        <fixedimage id="FI_QUERY" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-query.png" />
+        <fixedimage id="FI_QUERY" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="cmd/msgbox-query.png" />
         </align>
         <align cnt:expand="false" cnt:fill="true">
-        <fixedimage id="FI_WARNING" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="res/commandimagelist/msgbox-warning.png" />
+        <fixedimage id="FI_WARNING" cnt:expand="false" cnt:v-align="0.5" cnt:v-fill="0" graphic="cmd/msgbox-warning.png" />
         </align>
         <align cnt:expand="false" cnt:fill="true">
         <fixedtext id="FT_MESSAGE" _label="FT-LABEL" cnt:v-align="0.5" cnt:v-fill="0" />
diff --git a/toolkit/workben/layout/plugin.xml b/toolkit/workben/layout/plugin.xml
index c5f1b2a..5303e3a 100644
--- a/toolkit/workben/layout/plugin.xml
+++ b/toolkit/workben/layout/plugin.xml
@@ -10,7 +10,7 @@
              has_border="true" sizeable="true" moveable="true">
     <vbox spacing="5" border="5">
         <hbox spacing="5" cnt:expand="false">
-        <fixedimage id="FI_HEADER" cnt:expand="false" graphic="res/commandimagelist/sc_apply.png" />
+        <fixedimage id="FI_HEADER" cnt:expand="false" graphic="cmd/sc_apply.png" />
         <fixedtext id="FT_HEADER" _label="Plugin Test"/>
     </hbox>
     <fixedline id="FL_HEADER"/>
diff --git a/toolkit/workben/layout/recover.xml b/toolkit/workben/layout/recover.xml
index 58b2117..c695622 100644
--- a/toolkit/workben/layout/recover.xml
+++ b/toolkit/workben/layout/recover.xml
@@ -10,7 +10,7 @@
              has_border="true" sizeable="true" moveable="true">
     <vbox spacing="5" border="5" width="640">
         <hbox spacing="5" cnt:expand="false">
-        <fixedimage id="FI_HEADER" cnt:expand="false" graphic="res/commandimagelist/sc_apply.png" />
+        <fixedimage id="FI_HEADER" cnt:expand="false" graphic="cmd/sc_apply.png" />
         <fixedtext id="FT_HEADER" _label="OpenOffice.org Document Restore"/>
     </hbox>
     <fixedline id="FL_HEADER"/>
@@ -24,22 +24,22 @@ LINE TEST"/>
     <vbox cnt:fill="true" cnt:expand="true" cnt:padding="20" border="20" spacing="20">
         <hbox>
         <checkbox id="CB_DOC" state="1" cnt:expand="false" scale="false"/>
-        <fixedimage id="FI_DOC" cnt:v-align="0.5" image-align="0.5" cnt:expand="false" scale="false" graphic="res/commandimagelist/lc_insertdoc.png"/>
+        <fixedimage id="FI_DOC" cnt:v-align="0.5" image-align="0.5" cnt:expand="false" scale="false" graphic="cmd/lc_insertdoc.png"/>
         <fixedtext id="FT_DOC" _label="My document"/>
         </hbox>
         <hbox>
         <checkbox id="CB_SHEET" state="1" cnt:expand="false" scale="false" /> 
-        <fixedimage id="FI_SHEET" cnt:expand="false" scale="false" graphic="res/commandimagelist/lc_inserttable.png" />
+        <fixedimage id="FI_SHEET" cnt:expand="false" scale="false" graphic="cmd/lc_inserttable.png" />
         <fixedtext id="FT_SHEET" _label="My spreadsheet"/>
         </hbox>
         <hbox>
         <checkbox id="CB_DRAW" state="1" cnt:expand="false" scale="false"/>
-        <fixedimage id="FI_DRAW" cnt:expand="false" scale="false" graphic="res/commandimagelist/lc_insertdraw.png" />
+        <fixedimage id="FI_DRAW" cnt:expand="false" scale="false" graphic="cmd/lc_insertdraw.png" />
         <fixedtext id="FT_DRAW" _label="My drawing"/>
         </hbox>
         <hbox>
         <checkbox id="CB_PRESENT" state="1" cnt:expand="false" scale="false" />
-        <fixedimage id="FI_PRESENT" cnt:expand="false" scale="false" graphic="res/commandimagelist/lc_insertvideo.png" />
+        <fixedimage id="FI_PRESENT" cnt:expand="false" scale="false" graphic="cmd/lc_insertvideo.png" />
         <fixedtext id="FT_PRESENT" _label="My presentation"/>
         </hbox>
         <hbox border="5">


More information about the Libreoffice-commits mailing list