Skip to content

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

Convert RID_OFADLG_OPTIONS_TREE to .ui 

Conflicts:
	cui/source/inc/treeopt.hxx
	cui/source/options/treeopt.cxx

Change-Id: I971c7760e7252321aeca8a4f403515562a9057bb
Reviewed-on: https://gerrit.libreoffice.org/10323Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst a76bb8fd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 191 deletions
cui/UIConfig_cui.mk
Dosyayı görüntüle @ 73d790d0
......@@ -122,6 +122,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
cui/uiconfig/ui/opthtmlpage \
cui/uiconfig/ui/optionsdialog \
cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
cui/uiconfig/ui/optlingupage \
......
cui/source/inc/cuires.hrc
Dosyayı görüntüle @ 73d790d0
......@@ -108,7 +108,6 @@
#define RID_SVXPAGE_COLOR (RID_SVX_START + 60)
#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 )
#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
#define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115)
#define RID_RIDER_SLL_SITE (RID_OFA_START + 100)//?
#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101)//?
......@@ -441,6 +440,7 @@
#define RID_SVXSTR_LOADACCELCONFIG (RID_SVX_START + 1262)
#define RID_SVXSTR_SAVEACCELCONFIG (RID_SVX_START + 1263)
#define RID_SVXSTR_FILTERNAME_CFG (RID_SVX_START + 1264)
#define RID_SVXSTR_LOAD_ERROR (RID_SVX_START + 1265)
#endif
......
cui/source/inc/treeopt.hxx
Dosyayı görüntüle @ 73d790d0
......@@ -144,18 +144,13 @@ class OfaTreeOptionsDialog : public SfxModalDialog
{
private:
SvTreeListEntry* pCurrentPageEntry;
Timer maTreeLayoutTimer;
DECL_DLLPRIVATE_LINK( ImplHandleTreeLayoutTimerHdl, void* );
bool hasTreePendingLayout() const;
OKButton aOkPB;
CancelButton aCancelPB;
HelpButton aHelpPB;
PushButton aBackPB;
OKButton* pOkPB;
PushButton* pBackPB;
FixedLine aSeparatorFL;
SvTreeListBox aTreeLB;
SvTreeListBox* pTreeLB;
VclBox* pTabBox;
OUString sTitle;
OUString sNotLoadedError;
......@@ -180,7 +175,7 @@ private:
void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
void InitTreeAndHandler();
void Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame );
void ResizeTreeLB( void ); // resizes dialog so that treelistbox has no horizontal scroll bar
void InitWidgets();
void LoadExtensionOptions( const OUString& rExtensionId );
OUString GetModuleIdentifier( const com::sun::star::uno::Reference<
......@@ -189,9 +184,6 @@ private:
VectorOfNodes LoadNodes( Module* pModule, const OUString& rExtensionId );
void InsertNodes( const VectorOfNodes& rNodeList );
virtual void queue_resize(StateChangedType eReason = STATE_CHANGE_LAYOUT) SAL_OVERRIDE;
void SetPaneSize(Window *pPane);
protected:
DECL_LINK(ExpandedHdl_Impl, SvTreeListBox* );
DECL_LINK(ShowPageHdl_Impl, void *);
......
cui/source/options/treeopt.cxx
Dosyayı görüntüle @ 73d790d0
This diff is collapsed.
cui/source/options/treeopt.hrc deleted 100644 → 0
Dosyayı görüntüle @ a76bb8fd
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <sfx2/tabpage.hrc>
#include <svtools/controldims.hrc>
#define PB_OK 1
#define PB_CANCEL 2
#define PB_HELP 3
#define PB_BACK 4
#define TLB_PAGES 5
#define FL_SEPARATOR 19
#define ST_LOAD_ERROR 24
// metrics
#define WIDTH_PAGEFRAME TP_WIDTH
#define HEIGHT_PAGEFRAME TP_HEIGHT
#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
#define COL_2 (COL_1+0)
#define COL_3 (COL_2+RSC_SP_GRP_SPACE_X)
#define COL_11 (COL_3+WIDTH_PAGEFRAME)
#define COL_12 (COL_11+RSC_SP_DLG_INNERBORDER_RIGHT)
#define COL_10 (COL_11-RSC_CD_PUSHBUTTON_WIDTH)
#define COL_9 (COL_10-RSC_SP_CTRL_GROUP_X)
#define COL_8 (COL_9-RSC_CD_PUSHBUTTON_WIDTH)
#define COL_7 (COL_8-RSC_SP_CTRL_GROUP_X)
#define COL_6 (COL_7-RSC_CD_PUSHBUTTON_WIDTH)
#define COL_5 (COL_6-RSC_SP_CTRL_GROUP_X)
#define COL_4 (COL_5-RSC_CD_PUSHBUTTON_WIDTH)
#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP)
#define ROW_2 (ROW_1+HEIGHT_PAGEFRAME)
#define ROW_3 (ROW_2+RSC_SP_CTRL_GROUP_Y+RSC_CD_PUSHBUTTON_HEIGHT+RSC_CD_FIXEDLINE_HEIGHT)
#define ROW_4 (ROW_3+RSC_CD_FIXEDLINE_HEIGHT)
#define ROW_5 (ROW_4+RSC_CD_PUSHBUTTON_HEIGHT)
#define ROW_6 (ROW_5+RSC_SP_DLG_INNERBORDER_BOTTOM)
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/source/options/treeopt.src
Dosyayı görüntüle @ 73d790d0
......@@ -17,69 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "treeopt.hrc"
#include <cuires.hrc>
#include "helpid.hrc"
#include <svx/dialogs.hrc>
#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; }
ModalDialog RID_OFADLG_OPTIONS_TREE
{
HelpID = HID_OFADLG_OPTIONS_TREE;
Moveable = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( COL_12 , ROW_6 ) ;
Text [ en-US ] = "Options";
OKButton PB_OK
{
Pos = MAP_APPFONT ( COL_4, ROW_4 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
DefButton = TRUE;
};
CancelButton PB_CANCEL
{
Pos = MAP_APPFONT ( COL_6, ROW_4 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
};
HelpButton PB_HELP
{
Pos = MAP_APPFONT ( COL_8, ROW_4 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
};
PushButton PB_BACK
{
HelpID = "cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK";
Pos = MAP_APPFONT ( COL_10, ROW_4 ) ;
Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ;
TabStop = TRUE ;
Text [ en-US ] = "~Revert" ;
};
//TreeListBox
Control TLB_PAGES
{
Pos = MAP_APPFONT ( COL_1, ROW_1 ) ;
Size = MAP_APPFONT ( (COL_2-COL_1), (ROW_5-ROW_1) );
TabStop = TRUE ;
Border = TRUE;
};
FixedLine FL_SEPARATOR
{
Pos = MAP_APPFONT ( COL_3, ROW_3 ) ;
Size = MAP_APPFONT ( WIDTH_PAGEFRAME, ROW_4-ROW_3 ) ;
};
String ST_LOAD_ERROR
{
Text [ en-US ] = "The selected module could not be loaded.";
};
};
Resource RID_OFADLG_OPTIONS_TREE_PAGES
{
StringArray SID_GENERAL_OPTIONS
......
cui/source/tabpages/strings.src
Dosyayı görüntüle @ 73d790d0
......@@ -195,5 +195,9 @@ String RID_SVXSTR_READ_DATA_ERROR
{
Text [ en-US ] = "The file could not be loaded!" ;
};
String RID_SVXSTR_LOAD_ERROR
{
Text [ en-US ] = "The selected module could not be loaded.";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
cui/uiconfig/ui/optionsdialog.ui
Dosyayı görüntüle @ 73d790d0
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="OptionsDialog">
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Options</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>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<object class="svtlo-SvTreeListBox" id="pages:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Tree List-selection"/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
......@@ -18,8 +69,11 @@
<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>
......@@ -32,6 +86,7 @@
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</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>
......@@ -46,6 +101,7 @@
<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>
......@@ -60,6 +116,7 @@
<child>
<object class="GtkButton" id="revert">
<property name="label">gtk-revert-to-saved</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>
......@@ -76,64 +133,6 @@
<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="column_spacing">12</property>
<child>
<object class="GtkLabel" id="notloaded">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">The selected module could not be loaded.</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="svtlo-SvTreeListBox" id="pages">
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</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="GtkBox" id="pages">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
</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>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
......
svx/source/src/app.hrc
Dosyayı görüntüle @ 73d790d0
......@@ -46,7 +46,6 @@
#define RID_OFA_FORMNEW_DLG (RID_OFA_START + 112)
#define RID_OFA_TABPROPERTIES (RID_OFA_START + 113)
#define RID_OFADLG_REGISTRATION (RID_OFA_START + 114)
#define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115)
#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
#define RID_OFADLG_AWCP_VALUES (RID_OFA_START + 117)
#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119)
......
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