Skip to content

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

convert advanced db settings dialog to .ui format 

Change-Id: Ia3152b7cc5edd89f37c78841e10bb5feacc6fc12
üst 3e8622e5
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 46 deletions
dbaccess/UIConfig_dbaccess.mk
Dosyayı görüntüle @ 85f1c4a2
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,dbaccess)) $(eval $(call gb_UIConfig_UIConfig,dbaccess))
$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/advancedsettingsdialog \
dbaccess/uiconfig/ui/colwidthdialog \ dbaccess/uiconfig/ui/colwidthdialog \
dbaccess/uiconfig/ui/directsqldialog \ dbaccess/uiconfig/ui/directsqldialog \
dbaccess/uiconfig/ui/fielddialog \ dbaccess/uiconfig/ui/fielddialog \
......
dbaccess/inc/dbaccess_helpid.hrc
Dosyayı görüntüle @ 85f1c4a2
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
#define HID_DSADMIN_DIALOG "DBACCESS_HID_DSADMIN_DIALOG" #define HID_DSADMIN_DIALOG "DBACCESS_HID_DSADMIN_DIALOG"
#define HID_DSADMIN_TABCONTROL "DBACCESS_HID_DSADMIN_TABCONTROL"
#define HID_DSADMIN_PAGE_GENERAL "DBACCESS_HID_DSADMIN_PAGE_GENERAL" #define HID_DSADMIN_PAGE_GENERAL "DBACCESS_HID_DSADMIN_PAGE_GENERAL"
#define HID_DSADMIN_PAGE_DBASE "DBACCESS_HID_DSADMIN_PAGE_DBASE" #define HID_DSADMIN_PAGE_DBASE "DBACCESS_HID_DSADMIN_PAGE_DBASE"
#define HID_DSADMIN_PAGE_JDBC "DBACCESS_HID_DSADMIN_PAGE_JDBC" #define HID_DSADMIN_PAGE_JDBC "DBACCESS_HID_DSADMIN_PAGE_JDBC"
...@@ -272,7 +271,6 @@ ...@@ -272,7 +271,6 @@
#define HID_DSADMIN_PAGE_MSACCESS "DBACCESS_HID_DSADMIN_PAGE_MSACCESS" #define HID_DSADMIN_PAGE_MSACCESS "DBACCESS_HID_DSADMIN_PAGE_MSACCESS"
#define HID_DSADMIN_FLAT_PATH "DBACCESS_HID_DSADMIN_FLAT_PATH" #define HID_DSADMIN_FLAT_PATH "DBACCESS_HID_DSADMIN_FLAT_PATH"
#define HID_DSADMIN_CALC_PATH "DBACCESS_HID_DSADMIN_CALC_PATH" #define HID_DSADMIN_CALC_PATH "DBACCESS_HID_DSADMIN_CALC_PATH"
#define HID_DSADMIN_ADVANCED "DBACCESS_HID_DSADMIN_ADVANCED"
#define HID_DSADMIN_BOOLEANCOMPARISON "DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON" #define HID_DSADMIN_BOOLEANCOMPARISON "DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON"
#define HID_DSADMIN_ORACLE_DATABASE "DBACCESS_HID_DSADMIN_ORACLE_DATABASE" #define HID_DSADMIN_ORACLE_DATABASE "DBACCESS_HID_DSADMIN_ORACLE_DATABASE"
#define HID_DSADMIN_MAXROWSCAN "DBACCESS_HID_DSADMIN_MAXROWSCAN" #define HID_DSADMIN_MAXROWSCAN "DBACCESS_HID_DSADMIN_MAXROWSCAN"
......
dbaccess/source/ui/dlg/UserAdminDlg.src
Dosyayı görüntüle @ 85f1c4a2
...@@ -33,7 +33,6 @@ TabDialog DLG_DATABASE_USERADMIN ...@@ -33,7 +33,6 @@ TabDialog DLG_DATABASE_USERADMIN
TabControl 1 TabControl 1
{ {
OutputSize = TRUE ; OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
}; };
String STR_PAGETITLE_USERADMIN String STR_PAGETITLE_USERADMIN
{ {
......
dbaccess/source/ui/dlg/advancedsettings.cxx
Dosyayı görüntüle @ 85f1c4a2
...@@ -429,7 +429,8 @@ namespace dbaui ...@@ -429,7 +429,8 @@ namespace dbaui
// AdvancedSettingsDialog // AdvancedSettingsDialog
AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, SfxItemSet* _pItems, AdvancedSettingsDialog::AdvancedSettingsDialog( Window* _pParent, SfxItemSet* _pItems,
const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName ) const Reference< XComponentContext >& _rxContext, const Any& _aDataSourceName )
:SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_ADVANCED), _pItems) : SfxTabDialog(_pParent, "AdvancedSettingsDialog",
"dbaccess/ui/advancedsettingsdialog.ui", _pItems)
{ {
m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,_pParent,this)); m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxContext,_pParent,this));
m_pImpl->setDataSourceOrName(_aDataSourceName); m_pImpl->setDataSourceOrName(_aDataSourceName);
...@@ -446,16 +447,19 @@ namespace dbaui ...@@ -446,16 +447,19 @@ namespace dbaui
const FeatureSet& rFeatures( aMeta.getFeatureSet() ); const FeatureSet& rFeatures( aMeta.getFeatureSet() );
// auto-generated values? // auto-generated values?
if ( rFeatures.supportsGeneratedValues() ) if (rFeatures.supportsGeneratedValues())
AddTabPage( PAGE_GENERATED_VALUES, OUString( ModuleRes( STR_GENERATED_VALUE ) ), ODriversSettings::CreateGeneratedValuesPage, NULL ); AddTabPage("generated", ODriversSettings::CreateGeneratedValuesPage, NULL);
else
RemoveTabPage("generated");
// any "special settings"? // any "special settings"?
if ( rFeatures.supportsAnySpecialSetting() ) if (rFeatures.supportsAnySpecialSetting())
AddTabPage( PAGE_ADVANCED_SETTINGS_SPECIAL, OUString( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateSpecialSettingsPage, NULL ); AddTabPage("special", ODriversSettings::CreateSpecialSettingsPage, NULL);
else
RemoveTabPage("special");
// remove the reset button - it's meaning is much too ambiguous in this dialog // remove the reset button - it's meaning is much too ambiguous in this dialog
RemoveResetButton(); RemoveResetButton();
FreeResource();
} }
AdvancedSettingsDialog::~AdvancedSettingsDialog() AdvancedSettingsDialog::~AdvancedSettingsDialog()
......
dbaccess/source/ui/dlg/advancedsettings.hrc
Dosyayı görüntüle @ 85f1c4a2
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
/* bottom space */ START_Y /* bottom space */ START_Y
#define STR_GENERATED_VALUE 1
#define STR_DS_BEHAVIOUR 2
#define FL_SEPARATORAUTO 1 #define FL_SEPARATORAUTO 1
#define FL_DATAHANDLING 2 #define FL_DATAHANDLING 2
......
dbaccess/source/ui/dlg/advancedsettings.src
Dosyayı görüntüle @ 85f1c4a2
...@@ -358,34 +358,4 @@ TabPage PAGE_ADVANCED_SETTINGS_SPECIAL ...@@ -358,34 +358,4 @@ TabPage PAGE_ADVANCED_SETTINGS_SPECIAL
AUTO_MAXROWSCAN( 18*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 15*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 ) AUTO_MAXROWSCAN( 18*RELATED_CONTROLS + FIXEDTEXT_HEIGHT + 15*CHECKBOX_HEIGHT + RELATED_CONTROLS + ( LISTBOX_HEIGHT - CHECKBOX_HEIGHT ) / 2 )
}; };
//-------------------------------------------------------------------------
TabDialog DLG_DATABASE_ADVANCED
{
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
Hide = TRUE;
HelpId = HID_DSADMIN_ADVANCED;
TabControl 1
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
};
String STR_GENERATED_VALUE
{
Text [ en-US ] = "Generated Values";
};
String STR_DS_BEHAVIOUR
{
Text [ en-US ] = "Special Settings";
};
Text [ en-US ] = "Advanced Settings" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/dlg/dbadmin.src
Dosyayı görüntüle @ 85f1c4a2
...@@ -90,7 +90,6 @@ TabDialog DLG_DATABASE_ADMINISTRATION ...@@ -90,7 +90,6 @@ TabDialog DLG_DATABASE_ADMINISTRATION
TabControl 1 TabControl 1
{ {
OutputSize = TRUE ; OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
}; };
//......................................................................... //.........................................................................
...@@ -123,7 +122,6 @@ ModalDialog DLG_DATABASE_TYPE_CHANGE ...@@ -123,7 +122,6 @@ ModalDialog DLG_DATABASE_TYPE_CHANGE
TabControl 1 TabControl 1
{ {
OutputSize = TRUE ; OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
}; };
Text [ en-US ] = "Database properties" ; Text [ en-US ] = "Database properties" ;
}; };
......
dbaccess/source/ui/dlg/dbadminsetup.src
Dosyayı görüntüle @ 85f1c4a2
...@@ -41,7 +41,6 @@ ModalDialog DLG_DATABASE_WIZARD ...@@ -41,7 +41,6 @@ ModalDialog DLG_DATABASE_WIZARD
TabControl 1 TabControl 1
{ {
OutputSize = TRUE ; OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
}; };
String STR_DBWIZARDTITLE String STR_DBWIZARDTITLE
......
dbaccess/source/ui/inc/dbu_resource.hrc
Dosyayı görüntüle @ 85f1c4a2
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
#define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21 #define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21
// FREE // FREE
#define DLG_PASSWORD RID_DIALOG_START + 23 #define DLG_PASSWORD RID_DIALOG_START + 23
#define DLG_DATABASE_ADVANCED RID_DIALOG_START + 26
#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27 #define DLG_COLLECTION_VIEW RID_DIALOG_START + 27
#define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28 #define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28
#define DLG_DATABASE_WIZARD RID_DIALOG_START + 29 #define DLG_DATABASE_WIZARD RID_DIALOG_START + 29
......
dbaccess/uiconfig/ui/advancedsettingsdialog.ui 0 → 100644
Dosyayı görüntüle @ 85f1c4a2
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Mon Jan 20 16:15:12 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="AdvancedSettingsDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Advanced Settings</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="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="generated">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Generated Values</property>
</object>
<packing>
<property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child type="tab">
<object class="GtkLabel" id="special">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0.4699999988079071</property>
<property name="label" translatable="yes">Special Settings</property>
</object>
<packing>
<property name="position">1</property>
<property name="tab_fill">False</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>
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