diff options
-rw-r--r-- | sd/source/ui/dlg/custsdlg.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/dlg/custsdlg.src | 84 | ||||
-rw-r--r-- | sd/source/ui/inc/custsdlg.hrc | 4 | ||||
-rw-r--r-- | sd/uiconfig/simpress/ui/customslideshows.ui | 36 |
4 files changed, 13 insertions, 114 deletions
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index 8019f4304123..dd0c95d2fdce 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -55,6 +55,9 @@ SdCustomShowDlg::SdCustomShowDlg( Window* pWindow, get( m_pLbCustomShows, "customshowlist"); get( m_pCbxUseCustomShow, "usecustomshows" ); + m_pLbCustomShows->set_width_request(m_pLbCustomShows->approximate_char_width() * 32); + m_pLbCustomShows->SetDropDownLineCount(8); + Link aLink( LINK( this, SdCustomShowDlg, ClickButtonHdl ) ); m_pBtnNew->SetClickHdl( aLink ); m_pBtnEdit->SetClickHdl( aLink ); diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src index 79029ba06c7d..4fa50f2daa80 100644 --- a/sd/source/ui/dlg/custsdlg.src +++ b/sd/source/ui/dlg/custsdlg.src @@ -20,89 +20,7 @@ #include "custsdlg.hrc" #include "app.hrc" #include "helpids.h" -#define DIFF 20 -#define DIFF_Y 17 -ModalDialog DLG_CUSTOMSHOW -{ - HelpID = CMD_SID_CUSTOMSHOW_DLG ; - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 175 + DIFF , 114 + DIFF_Y ) ; - Moveable = TRUE ; - Closeable = TRUE ; - PushButton BTN_NEW - { - HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_NEW"; - Pos = MAP_APPFONT ( 120 + DIFF , 6 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~New..." ; - }; - PushButton BTN_EDIT - { - HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_EDIT"; - Pos = MAP_APPFONT ( 120 + DIFF , 23 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Edit..." ; - }; - PushButton BTN_REMOVE - { - HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_REMOVE"; - Pos = MAP_APPFONT ( 120 + DIFF , 40 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Delete" ; - }; - PushButton BTN_COPY - { - HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_COPY"; - Pos = MAP_APPFONT ( 120 + DIFF , 57 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Cop~y" ; - }; - HelpButton BTN_HELP - { - Pos = MAP_APPFONT ( 120 + DIFF , 74 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; - PushButton BTN_STARTSHOW - { - HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_STARTSHOW"; - Pos = MAP_APPFONT ( 120 + DIFF , 94 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Start" ; - }; - OKButton BTN_OK - { - Pos = MAP_APPFONT ( 120 + DIFF , 94 + DIFF_Y ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - Text [ en-US ] = "~Close" ; - }; - ListBox LB_CUSTOMSHOWS - { - HelpID = "sd:ListBox:DLG_CUSTOMSHOW:LB_CUSTOMSHOWS"; - Border = TRUE ; - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 102 + DIFF , 86 + DIFF_Y ) ; - TabStop = TRUE ; - QuickHelpText [ en-US ] = "Custom Screen Show" ; - }; - CheckBox CBX_USE_CUSTOMSHOW - { - HelpID = "sd:CheckBox:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW"; - Pos = MAP_APPFONT ( 6 , 96 + DIFF_Y ) ; - Size = MAP_APPFONT ( 112 + DIFF , 12 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Use Custom Slide Show" ; - }; - Text [ en-US ] = "Custom Slide Shows" ; -}; + ModalDialog DLG_DEFINE_CUSTOMSHOW { HelpID = HID_DLG_DEFINE_CUSTOMSHOW ; diff --git a/sd/source/ui/inc/custsdlg.hrc b/sd/source/ui/inc/custsdlg.hrc index cc04e35a42d5..8e9a2ceaa9eb 100644 --- a/sd/source/ui/inc/custsdlg.hrc +++ b/sd/source/ui/inc/custsdlg.hrc @@ -18,16 +18,13 @@ */ #include <sfx2/sfx.hrc> -#define DLG_CUSTOMSHOW 843 #define DLG_DEFINE_CUSTOMSHOW 890 #define BTN_OK 1 #define BTN_NEW 1 #define BTN_EDIT 2 #define BTN_REMOVE 3 #define BTN_COPY 4 -#define BTN_STARTSHOW 5 #define BTN_HELP 1 -#define LB_CUSTOMSHOWS 1 #define LB_PAGES 1 #define LB_CUSTOM_PAGES 2 #define FT_NAME 1 @@ -36,6 +33,5 @@ #define FT_CUSTOM_PAGES 3 #define BTN_CANCEL 2 #define BTN_ADD 1 -#define CBX_USE_CUSTOMSHOW 1 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/uiconfig/simpress/ui/customslideshows.ui b/sd/uiconfig/simpress/ui/customslideshows.ui index 16210580f380..fbd1a843fe2b 100644 --- a/sd/uiconfig/simpress/ui/customslideshows.ui +++ b/sd/uiconfig/simpress/ui/customslideshows.ui @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> - <object class="GtkListStore" id="liststore1"/> <object class="GtkDialog" id="CustomSlideShows"> <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="type_hint">dialog</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Custom Slide Shows</property> + <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="can_focus">False</property> @@ -19,13 +18,11 @@ <child> <object class="GtkButton" id="new"> <property name="label">gtk-new</property> - <property name="use_action_appearance">False</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="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -38,11 +35,9 @@ <child> <object class="GtkButton" id="edit"> <property name="label">gtk-edit</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -55,11 +50,9 @@ <child> <object class="GtkButton" id="delete"> <property name="label">gtk-delete</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -72,11 +65,9 @@ <child> <object class="GtkButton" id="copy"> <property name="label" translatable="yes">Cop_y</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> @@ -88,11 +79,9 @@ <child> <object class="GtkButton" id="help"> <property name="label">gtk-help</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -105,11 +94,9 @@ <child> <object class="GtkButton" id="startshow"> <property name="label" translatable="yes">_Start</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> @@ -121,11 +108,9 @@ <child> <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -157,7 +142,6 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="model">liststore1</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="treeview-selection2"/> </child> @@ -171,11 +155,9 @@ <child> <object class="GtkCheckButton" id="usecustomshows"> <property name="label" translatable="yes">_Use Custom Slide Show</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -196,13 +178,13 @@ </object> </child> <action-widgets> - <action-widget response="0">button1</action-widget> - <action-widget response="0">button2</action-widget> - <action-widget response="0">button3</action-widget> - <action-widget response="0">button4</action-widget> - <action-widget response="0">button5</action-widget> - <action-widget response="0">button6</action-widget> - <action-widget response="0">button7</action-widget> + <action-widget response="0">new</action-widget> + <action-widget response="0">edit</action-widget> + <action-widget response="0">delete</action-widget> + <action-widget response="0">copy</action-widget> + <action-widget response="0">help</action-widget> + <action-widget response="0">startshow</action-widget> + <action-widget response="0">ok</action-widget> </action-widgets> </object> </interface> |