Skip to content

C
core
Kaydet (Commit) 9586554c authored tarafından Palenik Mihály's avatar Palenik Mihály Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert MD_ICONSELECTOR and MD_ICONCHANGE to .ui 

I implemented multiple row ToolBox in MD_ICONSELECTOR.

Change-Id: I0f275b2332a15f3ba37952f6a104099e4f1f1678
Reviewed-on: https://gerrit.libreoffice.org/10112Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 8e0520ac
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 153 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ 9586554c
......@@ -78,6 +78,8 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/hyperlinkmailpage \
cui/uiconfig/ui/hyperlinknewdocpage \
cui/uiconfig/ui/hyphenate \
cui/uiconfig/ui/iconchangedialog \
cui/uiconfig/ui/iconselectordialog \
cui/uiconfig/ui/insertfloatingframe \
cui/uiconfig/ui/insertoleobject \
cui/uiconfig/ui/insertplugin \
......
cui/source/customize/cfg.cxx
Dosyayı görüntüle @ 9586554c
This diff is collapsed.
cui/source/customize/cfg.hrc
Dosyayı görüntüle @ 9586554c
......@@ -43,23 +43,4 @@
#define QBX_CONFIRM_RESTORE_DEFAULT (66 + CFG_OFFSET)
#define QBX_CONFIRM_DELETE_TOOLBAR (67 + CFG_OFFSET)
#define MD_ICONSELECTOR (90 + CFG_OFFSET)
#define FT_SYMBOLS (91 + CFG_OFFSET)
#define TB_SYMBOLS (92 + CFG_OFFSET)
#define FT_NOTE (93 + CFG_OFFSET)
#define BTN_IMPORT (97 + CFG_OFFSET)
#define IMAGE_BTN_COLOR (98 + CFG_OFFSET)
#define BTN_OK (103 + CFG_OFFSET)
#define BTN_CANCEL (104 + CFG_OFFSET)
#define BTN_HELP (105 + CFG_OFFSET)
#define FL_SEPARATOR (108 + CFG_OFFSET)
#define BTN_DELETE (109 + CFG_OFFSET)
#define MD_ICONCHANGE (119 + CFG_OFFSET)
#define FTCHGE_DESCRIPTION (120 + CFG_OFFSET)
#define EDT_ADDR (121 + CFG_OFFSET)
#define MD_BTN_OK (122 + CFG_OFFSET)
#define FI_INFO (123 + CFG_OFFSET)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/customize/cfg.src
Dosyayı görüntüle @ 9586554c
......@@ -161,127 +161,6 @@ String RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION
#define IMAGE_STDBTN_COLOR Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }
#endif
ModalDialog MD_ICONSELECTOR
{
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 240 , 152 ) ;
Text [ en-US ] = "Change Icon" ;
Moveable = TRUE ;
HelpId = HID_SVX_CONFIG_ICON_SELECTOR;
FixedText FT_SYMBOLS
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 172 , 8 ) ;
Text [ en-US ] = "Icons" ;
};
ToolBox TB_SYMBOLS
{
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 160 , 80 ) ;
Scroll = TRUE ;
LineSpacing = TRUE ;
Customize = FALSE ;
};
OKButton BTN_OK
{
Pos = MAP_APPFONT ( 60 , 130 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT ( 120 , 130 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT ( 180 , 130 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
PushButton BTN_IMPORT
{
HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT";
Pos = MAP_APPFONT ( 184 , 7 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text[ en-US ] = "Import...";
};
PushButton BTN_DELETE
{
HelpID = "cui:PushButton:MD_ICONSELECTOR:BTN_DELETE";
Pos = MAP_APPFONT ( 184 , 24 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
Text[ en-US ] = "Delete...";
};
FixedText FT_NOTE
{
Pos = MAP_APPFONT ( 12 , 95 ) ;
Size = MAP_APPFONT ( 200 , 24 ) ;
Text [ en-US ] = "Note:\nThe size of an icon should be 16x16 pixel to achieve best quality. Different sized icons will be scaled automatically." ;
Left = TRUE ;
WordBreak = TRUE;
};
FixedLine FL_SEPARATOR
{
Pos = MAP_APPFONT ( 0, 120 );
Size = MAP_APPFONT ( 240, 8 );
};
Color IMAGE_BTN_COLOR
{
Red = 0xC000 ;
Green = 0xC000 ;
Blue = 0xC000 ;
};
};
//added for issue83555
ModalDialog MD_ICONCHANGE
{
HelpID = "cui:ModalDialog:MD_ICONCHANGE";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 200 , 150 ) ;
Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION" ;
Moveable = TRUE ;
FixedImage FI_INFO
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 24 , 24 ) ;
Fixed = Image
{
};
};
FixedText FTCHGE_DESCRIPTION
{
Pos = MAP_APPFONT ( 30 ,15 ) ;
Size = MAP_APPFONT ( 200 , 50 ) ;
Text [ en-US ] = "The files listed below could not be imported.\nThe file format could not be interpreted." ;
};
MultiLineEdit EDT_ADDR
{
HelpID = "cui:MultiLineEdit:MD_ICONCHANGE:EDT_ADDR";
Pos = MAP_APPFONT ( 30 , 38) ;
Size = MAP_APPFONT ( 140 , 83 ) ;
Border = TRUE;
IgnoreTab = TRUE;
ReadOnly = TRUE;
};
OKButton MD_BTN_OK
{
Pos = MAP_APPFONT ( 68 , 131 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
};
// Strings ---------------------------------------------------------------
String RID_SVXSTR_IMPORT_ICON_ERROR
{
......
cui/source/inc/cfg.hxx
Dosyayı görüntüle @ 9586554c
......@@ -692,18 +692,21 @@ public:
}
};
struct SvxIconSelectorToolBoxItem
{
Image aImg;
OUString aText;
void* pData;
};
class SvxIconSelectorDialog : public ModalDialog
{
private:
FixedText aFtDescription;
ToolBox aTbSymbol;
FixedText aFtNote;
OKButton aBtnOK;
CancelButton aBtnCancel;
HelpButton aBtnHelp;
PushButton aBtnImport;
PushButton aBtnDelete;
FixedLine aFlSeparator;
ToolBox* pTbSymbol;
FixedText* pFtNote;
PushButton* pBtnImport;
PushButton* pBtnDelete;
Size aTbSize;
sal_uInt16 m_nNextId;
sal_Int32 m_nExpectedSize;
......@@ -766,10 +769,8 @@ public:
class SvxIconChangeDialog : public ModalDialog
{
private:
FixedImage aFImageInfo;
OKButton aBtnOK;
FixedText aDescriptionLabel;
VclMultiLineEdit aLineEditDescription;
FixedImage* pFImageInfo;
VclMultiLineEdit* pLineEditDescription;
public:
SvxIconChangeDialog(Window *pWindow, const OUString& aMessage);
};
......
cui/uiconfig/ui/iconchangedialog.ui 0 → 100644
Dosyayı görüntüle @ 9586554c
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="IconChange">
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">%PRODUCTNAME %PRODUCTVERSION</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">center</property>
<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="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</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>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkImage" id="infoImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-missing-image</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">The files listed below could not be imported.
The file format could not be interpreted.</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkTextView" id="addrTextview:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="editable">False</property>
<property name="wrap_mode">word</property>
<property name="cursor_visible">False</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">ok</action-widget>
</action-widgets>
</object>
</interface>
cui/uiconfig/ui/iconselectordialog.ui 0 → 100644
Dosyayı görüntüle @ 9586554c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment