Skip to content

C
core
Kaydet (Commit) ea89ba42 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert module and dialog tabpages to .ui 

Change-Id: I2954a734b44be22d4d7ffae17480dde1c0ac64e7
üst 8c51c5fa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 425 additions and 180 deletions
basctl/UIConfig_basicide.mk
Dosyayı görüntüle @ ea89ba42
......@@ -31,11 +31,13 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/defaultlanguage \
basctl/uiconfig/basicide/ui/dialogpage \
basctl/uiconfig/basicide/ui/exportdialog \
basctl/uiconfig/basicide/ui/gotolinedialog \
basctl/uiconfig/basicide/ui/importlibdialog \
basctl/uiconfig/basicide/ui/libpage \
basctl/uiconfig/basicide/ui/managebreakpoints \
basctl/uiconfig/basicide/ui/modulepage \
basctl/uiconfig/basicide/ui/newlibdialog \
basctl/uiconfig/basicide/ui/organizedialog \
))
......
basctl/inc/basidesh.hrc
Dosyayı görüntüle @ ea89ba42
......@@ -30,8 +30,6 @@
#define RID_POPUP_BRKDLG ( RID_BASICIDE_START + 10 )
#define RID_POPUP_BRKPROPS ( RID_BASICIDE_START + 11 )
#define RID_POPUP_TABBAR ( RID_BASICIDE_START + 12 )
#define RID_TP_MODULS ( RID_BASICIDE_START + 37 )
#define RID_TP_DLGS ( RID_BASICIDE_START + 39 )
#define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 )
#define RID_PRINTDLG_STRLIST ( RID_BASICIDE_START + 78 )
......
basctl/inc/helpid.hrc
Dosyayı görüntüle @ ea89ba42
......@@ -24,7 +24,6 @@
#define HID_BASICIDE_MACROS "BASCTL_HID_BASICIDE_MACROS"
#define HID_BASICIDE_LIBS "BASCTL_HID_BASICIDE_LIBS"
#define HID_BASICIDE_MODULES_TREE "BASCTL_HID_BASICIDE_MODULES_TREE"
#define HID_BASICIDE_OBJECTCAT "BASCTL_HID_BASICIDE_OBJECTCAT"
#define HID_BASICIDE_OBJCAT_SHOW "BASCTL_HID_BASICIDE_OBJCAT_SHOW"
......
basctl/source/basicide/moduldl2.cxx
Dosyayı görüntüle @ ea89ba42
......@@ -20,7 +20,6 @@
#include <vcl/layout.hxx>
#include <sot/storinfo.hxx>
#include <moduldlg.hrc>
#include <moduldlg.hxx>
#include <basidesh.hrc>
#include <basidesh.hxx>
......
basctl/source/basicide/moduldlg.hrc deleted 100644 → 0
Dosyayı görüntüle @ 8c51c5fa
/* -*- 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 .
*/
#ifndef BASCTL_MODULDLG_HRC
#define BASCTL_MODULDLG_HRC
#include <svl/solar.hrc>
#define RID_STR_LIB 1
#define RID_TRLBOX 2
// free
#define RID_PB_EDIT 4
#define RID_PB_NEWMOD 6
#define RID_PB_NEWDLG 7
#define RID_PB_DELETE 8
#define RID_PB_NEWLIB 9
#define RID_PB_APPEND 10
#define RID_PB_PASSWORD 11
#define RID_LB_BASICS 12
#define RID_STR_BASICS 13
#define RID_PB_EXPORT 14
#define RID_TC_ORGANIZE 30
#define RID_PB_OK 31
#define RID_PB_CANCEL 32
#define RID_CTRL_LIBS 33
#define RID_FL_OPTIONS 34
#define RID_CB_REF 35
#define RID_CB_REPL 36
#define RID_FT_STORAGENAME 38
#define RID_FT_NEWLIB 40
#define RID_ED_LIBNAME 41
#define RB_EXPORTASPACKAGE 42
#define RB_EXPORTASBASIC 43
#endif // BASCTL_MODULDLG_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
basctl/source/basicide/moduldlg.hxx
Dosyayı görüntüle @ ea89ba42
......@@ -111,7 +111,8 @@ protected:
SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos, sal_Bool bMove );
public:
ExtTreeListBox( Window* pParent, const ResId& rRes );
ExtTreeListBox(Window* pParent, const ResId& rRes);
ExtTreeListBox(Window* pParent, WinBits nStyle);
~ExtTreeListBox();
};
......@@ -182,12 +183,11 @@ public:
class ObjectPage: public TabPage
{
protected:
FixedText aLibText;
ExtTreeListBox aBasicBox;
PushButton aEditButton;
PushButton aNewModButton;
PushButton aNewDlgButton;
PushButton aDelButton;
ExtTreeListBox* m_pBasicBox;
PushButton* m_pEditButton;
PushButton* m_pNewModButton;
PushButton* m_pNewDlgButton;
PushButton* m_pDelButton;
DECL_LINK( BasicBoxHighlightHdl, TreeListBox * );
DECL_LINK( ButtonHdl, Button * );
......@@ -204,7 +204,7 @@ protected:
virtual void DeactivatePage();
public:
ObjectPage( Window* pParent, const ResId& rResId, sal_uInt16 nMode );
ObjectPage(Window* pParent, const OString& rName, sal_uInt16 nMode);
void SetCurrentEntry( EntryDescriptor& rDesc );
void SetTabDlg( TabDialog* p ) { pTabDlg = p;}
......
basctl/source/basicide/moduldlg.src
Dosyayı görüntüle @ ea89ba42
......@@ -18,118 +18,8 @@
*/
#include "helpid.hrc"
#include <moduldlg.hrc>
#include <basidesh.hrc>
TabPage RID_TP_MODULS
{
HelpId = "basctl:TabPage:RID_TP_MODULS" ;
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 210 , 140 ) ;
FixedText RID_STR_LIB
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 130 , 10 ) ;
Text [ en-US ] = "M~odule" ;
};
Control RID_TRLBOX
{
HelpId = HID_BASICIDE_MODULES_TREE ;
Pos = MAP_APPFONT ( 6 , 17 ) ;
Size = MAP_APPFONT ( 130 , 117 ) ;
TabStop = TRUE ;
Border = TRUE ;
};
PushButton RID_PB_EDIT
{
HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_EDIT";
Text [ en-US ] = "~Edit";
Pos = MAP_APPFONT ( 144 , 6 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
PushButton RID_PB_NEWMOD
{
HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWMOD";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~New..." ;
TabStop = TRUE ;
};
PushButton RID_PB_NEWDLG
{
HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_NEWDLG";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~New..." ;
TabStop = TRUE ;
};
PushButton RID_PB_DELETE
{
HelpID = "basctl:PushButton:RID_TP_MODULS:RID_PB_DELETE";
Pos = MAP_APPFONT ( 144 , 120 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Delete" ;
TabStop = TRUE ;
};
};
TabPage RID_TP_DLGS
{
HelpID = "basctl:TabPage:RID_TP_DLGS";
Hide = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 210 , 140 ) ;
FixedText RID_STR_LIB
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 130 , 10 ) ;
Text [ en-US ] = "Dialog" ;
};
Control RID_TRLBOX
{
HelpId = HID_BASICIDE_MODULES_TREE ;
Pos = MAP_APPFONT ( 6 , 17 ) ;
Size = MAP_APPFONT ( 130 , 117 ) ;
TabStop = TRUE ;
Border = TRUE ;
};
PushButton RID_PB_EDIT
{
HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_EDIT";
Text [ en-US ] = "~Edit";
Pos = MAP_APPFONT ( 144 , 6 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
PushButton RID_PB_NEWMOD
{
HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWMOD";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~New..." ;
TabStop = TRUE ;
};
PushButton RID_PB_NEWDLG
{
HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_NEWDLG";
Pos = MAP_APPFONT ( 144 , 103 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~New..." ;
TabStop = TRUE ;
};
PushButton RID_PB_DELETE
{
HelpID = "basctl:PushButton:RID_TP_DLGS:RID_PB_DELETE";
Pos = MAP_APPFONT ( 144 , 120 ) ;
Size = MAP_APPFONT ( 60 , 14 ) ;
Text [ en-US ] = "~Delete" ;
TabStop = TRUE ;
};
};
String RID_STR_EXPORTPACKAGE
{
Text [ en-US ] = "Export library as extension";
......
basctl/uiconfig/basicide/ui/dialogpage.ui 0 → 100644
Dosyayı görüntüle @ ea89ba42
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Mon Jan 6 11:33:55 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="DialogPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="row_spacing">12</property>
<child>
<object class="GtkGrid" id="grid2">
<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">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkGrid" id="grid3">
<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">12</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Dialog</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">library:border</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="basctllo-ExtTreeListBox" id="library:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="CheckBox List-selection1"/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</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="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="edit">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">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>
<child>
<object class="GtkButton" id="newmodule">
<property name="label" translatable="yes">_New...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="newdialog">
<property name="label" translatable="yes">_New...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="password">
<property name="label" translatable="yes">_Password...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="import">
<property name="label" translatable="yes">_Import...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkButton" id="export">
<property name="label" translatable="yes">_Export...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</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="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="edit"/>
<widget name="newmodule"/>
<widget name="newdialog"/>
<widget name="delete"/>
<widget name="password"/>
<widget name="import"/>
<widget name="export"/>
</widgets>
</object>
</interface>
basctl/uiconfig/basicide/ui/modulepage.ui 0 → 100644
Dosyayı görüntüle @ ea89ba42
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Mon Jan 6 11:33:29 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="ModulePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="row_spacing">12</property>
<child>
<object class="GtkGrid" id="grid2">
<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">12</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkGrid" id="grid3">
<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">12</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">M_odule</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">library:border</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="basctllo-ExtTreeListBox" id="library:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="CheckBox List-selection1"/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</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="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="edit">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">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>
<child>
<object class="GtkButton" id="newmodule">
<property name="label" translatable="yes">_New...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="newdialog">
<property name="label" translatable="yes">_New...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="delete">
<property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
<property name="secondary">True</property>
</packing>
</child>
<child>
<object class="GtkButton" id="password">
<property name="label" translatable="yes">_Password...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="import">
<property name="label" translatable="yes">_Import...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkButton" id="export">
<property name="label" translatable="yes">_Export...</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</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="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="edit"/>
<widget name="newmodule"/>
<widget name="newdialog"/>
<widget name="delete"/>
<widget name="password"/>
<widget name="import"/>
<widget name="export"/>
</widgets>
</object>
</interface>
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ ea89ba42
......@@ -409,6 +409,9 @@
<glade-widget-class title="Macro Library" name="basctllo-TreeListBox"
generic-name="Macro Library List" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Extended Macro Library" name="basctllo-ExtTreeListBox"
generic-name="Extended Macro Library List" parent="basctllo-TreeListBox"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Tree List" name="svtlo-SvTreeListBox"
generic-name="Tree List" parent="GtkTreeView"
icon-name="widget-gtk-treeview">
......
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