Skip to content

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

convert database save as dialog to .ui 

Change-Id: Ifc8d43930ecbd3ccd67147cd891260555976dc0d
üst c234d4c2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 182 deletions
dbaccess/AllLangResTarget_dbu.mk
Dosyayı görüntüle @ 24a00c43
......@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/dlg/dbadmin.src \
dbaccess/source/ui/dlg/dbfindex.src \
dbaccess/source/ui/dlg/directsql.src \
dbaccess/source/ui/dlg/dlgsave.src \
dbaccess/source/ui/dlg/dsselect.src \
dbaccess/source/ui/dlg/indexdialog.src \
dbaccess/source/ui/dlg/paramdialog.src \
......
dbaccess/UIConfig_dbaccess.mk
Dosyayı görüntüle @ 24a00c43
......@@ -22,6 +22,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/queryfilterdialog \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/rowheightdialog \
dbaccess/uiconfig/ui/savedialog \
dbaccess/uiconfig/ui/specialsettingspage \
dbaccess/uiconfig/ui/sortdialog \
dbaccess/uiconfig/ui/tablesfilterdialog \
......
dbaccess/inc/dbaccess_helpid.hrc
Dosyayı görüntüle @ 24a00c43
......@@ -78,7 +78,6 @@
#define HID_DLG_ERROR "DBACCESS_HID_DLG_ERROR"
#define HID_DLG_TEXT "DBACCESS_HID_DLG_TEXT"
#define UID_SQLERROR_BUTTONMORE "DBACCESS_UID_SQLERROR_BUTTONMORE"
#define HID_DLG_SAVE_AS "DBACCESS_HID_DLG_SAVE_AS"
#define HID_BROWSER_QUERY_EDIT "DBACCESS_HID_BROWSER_QUERY_EDIT"
#define HID_BROWSER_QUERY_DELETE "DBACCESS_HID_BROWSER_QUERY_DELETE"
......@@ -247,8 +246,6 @@
#define HID_DSADMIN_USESSL_LDAP "DBACCESS_HID_DSADMIN_USESSL_LDAP"
#define HID_BROWSER_QUERY_WIZARD "DBACCESS_HID_BROWSER_QUERY_WIZARD"
#define HID_DLG_RENAME "DBACCESS_HID_DLG_RENAME"
#define HID_DSADMIN_PAGE_MYSQL_JDBC "DBACCESS_HID_DSADMIN_PAGE_MYSQL_JDBC"
#define HID_DSADMIN_DBASE_PATH "DBACCESS_HID_DSADMIN_DBASE_PATH"
......
dbaccess/source/ui/app/app.src
Dosyayı görüntüle @ 24a00c43
......@@ -471,4 +471,29 @@ String STR_PAGETITLE_CONNECTION
Text [ en-US ] = "Connection settings" ;
};
String STR_TBL_LABEL
{
Text [ en-US ] = "~Table Name" ;
};
String STR_VW_LABEL
{
Text [ en-US ] = "~Name of table view" ;
};
String STR_QRY_LABEL
{
Text [ en-US ] = "~Query name" ;
};
String STR_TITLE_RENAME
{
Text [ en-US ] = "Rename to";
};
String STR_TITLE_PASTE_AS
{
Text [ en-US ] = "Insert as";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/control/SqlNameEdit.cxx
Dosyayı görüntüle @ 24a00c43
......@@ -18,6 +18,8 @@
*/
#include "SqlNameEdit.hxx"
#include <vcl/builder.hxx>
namespace dbaui
{
sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const OUString& _sAllowedChars)
......@@ -79,4 +81,14 @@ namespace dbaui
}
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameEdit(Window *pParent, VclBuilder::stringmap &)
{
return new dbaui::OSQLNameEdit(pParent);
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOSQLNameComboBox(Window *pParent, VclBuilder::stringmap &)
{
return new dbaui::OSQLNameComboBox(pParent);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/dlg/dlgsave.hrc deleted 100644 → 0
Dosyayı görüntüle @ c234d4c2
/* -*- 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 DBAUI_DLGSAVE_HRC
#define DBAUI_DLGSAVE_HRC
// defines ------------------------------------------------------------------
#define PB_OK 1
#define PB_CANCEL 1
#define PB_HELP 1
#define ET_CATALOG 1
#define ET_SCHEMA 2
#define ET_TITLE 3
#define FT_DESCRIPTION 1
#define FT_CATALOG 2
#define FT_SCHEMA 3
#define FT_TITLE 4
#define STR_TBL_LABEL 1
#define STR_VW_LABEL 2
#define STR_QRY_LABEL 3
#define STR_TITLE_RENAME 4
#define STR_TITLE_PASTE_AS 6
#endif // DBAUI_DLGSAVE_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/dlg/dlgsave.src deleted 100644 → 0
Dosyayı görüntüle @ c234d4c2
/* -*- 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 "dlgsave.hrc"
#include "dbu_dlg.hrc"
#include "dbaccess_helpid.hrc"
ModalDialog DLG_SAVE_AS
{
OutputSize = TRUE ;
SVLook = TRUE ;
HelpId = HID_DLG_SAVE_AS ;
Size = MAP_APPFONT ( 174 , 75 ) ;
Moveable = TRUE ;
Closeable = TRUE ;
Text [ en-US ] = "Save As" ;
FixedText FT_DESCRIPTION
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
Size = MAP_APPFONT ( 174 - 12 , 16 ) ;
WordBreak=TRUE;
Text [ en-US ] = "Please enter a name for the object to be created:";
};
FixedText FT_CATALOG
{
Pos = MAP_APPFONT ( 6 , 26 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "~Catalog";
};
ComboBox ET_CATALOG
{
HelpID = "dbaccess:ComboBox:DLG_SAVE_AS:ET_CATALOG";
Border = TRUE ;
Pos = MAP_APPFONT ( 77 , 25 ) ;
Size = MAP_APPFONT ( 89 , 12 ) ;
SVLook = TRUE ;
TabStop = TRUE ;
DropDown = TRUE ;
AutoHScroll = TRUE ;
};
FixedText FT_SCHEMA
{
Pos = MAP_APPFONT ( 6 , 43 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
Text [ en-US ] = "~Schema";
};
ComboBox ET_SCHEMA
{
HelpID = "dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA";
Border = TRUE ;
Pos = MAP_APPFONT ( 77 , 42 ) ;
Size = MAP_APPFONT ( 89 , 12 ) ;
SVLook = TRUE ;
TabStop = TRUE ;
DropDown = TRUE ;
AutoHScroll = TRUE ;
};
FixedText FT_TITLE
{
Pos = MAP_APPFONT ( 6 , 60 ) ;
Size = MAP_APPFONT ( 70 , 10 ) ;
};
Edit ET_TITLE
{
HelpID = "dbaccess:Edit:DLG_SAVE_AS:ET_TITLE";
Border = TRUE ;
Pos = MAP_APPFONT ( 77 , 59 ) ;
Size = MAP_APPFONT ( 89 , 12 ) ;
TabStop = TRUE ;
};
OKButton PB_OK
{
Pos = MAP_APPFONT ( 6 , 77 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
Pos = MAP_APPFONT ( 62 , 77 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
HelpButton PB_HELP
{
Pos = MAP_APPFONT ( 118 , 77 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
};
// String Resourcen ------------------------------------------------------------------
String STR_TBL_LABEL
{
Text [ en-US ] = "~Table Name" ;
};
String STR_VW_LABEL
{
Text [ en-US ] = "~Name of table view" ;
};
String STR_QRY_LABEL
{
Text [ en-US ] = "~Query name" ;
};
String STR_TITLE_RENAME
{
Text [ en-US ] = "Rename to";
};
String STR_TITLE_PASTE_AS
{
Text [ en-US ] = "Insert as";
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/inc/dbu_resource.hrc
Dosyayı görüntüle @ 24a00c43
......@@ -81,7 +81,6 @@
#define DLG_DATASOURCE_SELECTION RID_DIALOG_START + 4
#define DLG_PARAMETERS RID_DIALOG_START + 5
#define DLG_SAVE_AS RID_DIALOG_START + 11
#define DLG_JOIN_TABADD RID_DIALOG_START + 14
#define DLG_QRY_JOIN RID_DIALOG_START + 15
#define WIZ_RTFCOPYTABLE RID_DIALOG_START + 16
......@@ -267,6 +266,11 @@
#define STR_PAGETITLE_ADVANCED RID_STR_GEN_START + 39
#define RID_STR_EXTENSION_NOT_PRESENT RID_STR_GEN_START + 40
#define STR_PAGETITLE_CONNECTION RID_STR_GEN_START + 41
#define STR_TBL_LABEL RID_STR_GEN_START + 42
#define STR_VW_LABEL RID_STR_GEN_START + 43
#define STR_QRY_LABEL RID_STR_GEN_START + 44
#define STR_TITLE_RENAME RID_STR_GEN_START + 45
#define STR_TITLE_PASTE_AS RID_STR_GEN_START + 46
//========================================================================
// untyped resources
......
dbaccess/uiconfig/ui/savedialog.ui 0 → 100644
Dosyayı görüntüle @ 24a00c43
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Tue Feb 4 11:57:25 2014 -->
<interface>
<!-- interface-requires LibreOffice 1.0 -->
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="SaveDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Save As</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="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">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label">gtk-ok</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>
<child>
<object class="GtkButton" id="cancel">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">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">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">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">2</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="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="descriptionft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Please enter a name for the object to be created:</property>
<property name="wrap">True</property>
<property name="max_width_chars">52</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="catalogft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Catalog</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">catalog</property>
</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>
<child>
<object class="GtkLabel" id="schemaft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Schema</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">schema</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="dbulo-OSQLNameComboBox" id="schema">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="titleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">title</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="dbulo-OSQLNameEdit" id="title">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="dbulo-OSQLNameComboBox" id="catalog">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</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>
</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-widget response="0">cancel</action-widget>
<action-widget response="0">help</action-widget>
</action-widgets>
</object>
</interface>
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 24a00c43
......@@ -33,6 +33,9 @@
<glade-widget-class title="Hyphen Edit" name="cuilo-HyphenEdit"
generic-name="ReplaceEdit" parent="GtkEntry"
icon-name="widget-gtk-textentry"/>
<glade-widget-class title="OSQL NameEdit" name="dbulo-OSQLNameEdit"
generic-name="OSQLNameEdit" parent="GtkEntry"
icon-name="widget-gtk-textentry"/>
<glade-widget-class title="VclComboBoxText" name="VclComboBoxText"
generic-name="ComboBoxText" parent="GtkComboBoxText"
......@@ -214,6 +217,11 @@
<glade-widget-class title="Limit ListBox" name="dbulo-LimitBox"
generic-name="LimitBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
<glade-widget-class title="OSQL NameComboBox" name="dbulo-OSQLNameComboBox"
generic-name="OSQLNameComboBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
<glade-widget-class title="Font Preview" name="svxlo-SvxFontPrevWindow"
generic-name="Font Preview Window" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea">
......
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