Skip to content

C
core
Kaydet (Commit) 020e2839 authored tarafından Palenik Mihály's avatar Palenik Mihály Kaydeden (comit) David Tardon
Dosyalara gözat
Seçenekler

Convert PAGE_CONNECTION to .ui 

Change-Id: Id65d57b848280fee12384b4f470782a28233acd8
Reviewed-on: https://gerrit.libreoffice.org/10748Reviewed-by: 's avatarDavid Tardon <dtardon@redhat.com>
Tested-by: 's avatarDavid Tardon <dtardon@redhat.com>
üst c0510515
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 178 deletions
dbaccess/UIConfig_dbaccess.mk
Dosyayı görüntüle @ 020e2839
......@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/connectionpage \
dbaccess/uiconfig/ui/copytablepage \
dbaccess/uiconfig/ui/dbaseindexdialog \
dbaccess/uiconfig/ui/dbwizconnectionpage \
dbaccess/uiconfig/ui/dbwizmysqlintropage \
dbaccess/uiconfig/ui/dbwizmysqlnativepage \
dbaccess/uiconfig/ui/dbwizspreadsheetpage \
......
dbaccess/source/ui/dlg/ConnectionPage.hrc deleted 100644 → 0
Dosyayı görüntüle @ c0510515
/* -*- 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_CONNECTIONPAGE_HRC
#define DBAUI_CONNECTIONPAGE_HRC
// control ids
#define FT_USERNAME 1
#define FT_JDBCDRIVERCLASS 2
#define FT_MYSQL_DATABASE_NAME 5
// FREE
#define FT_NO_ADDITIONAL_SETTINGS 10
#define FT_HOSTNAME 11
#define ET_USERNAME 1
#define ET_JDBCDRIVERCLASS 2
#define PB_TESTDRIVERCLASS 1
#define PB_TESTCONNECTION 2
#define CB_PASSWORD_REQUIRED 1
#define FL_SEPARATOR2 1
#define FL_SEPARATOR3 2
#endif // DBAUI_CONNECTIONPAGE_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/dlg/ConnectionPage.hxx
Dosyayı görüntüle @ 020e2839
......@@ -35,22 +35,20 @@ namespace dbaui
class OConnectionTabPage : public OConnectionHelper
{
protected:
// connection
FixedLine m_aFL1;
// user authentification
FixedLine m_aFL2;
FixedText m_aUserNameLabel;
Edit m_aUserName;
CheckBox m_aPasswordRequired;
FixedText* m_pFL2;
FixedText* m_pUserNameLabel;
Edit* m_pUserName;
CheckBox* m_pPasswordRequired;
// jdbc driver
FixedLine m_aFL3;
FixedText m_aJavaDriverLabel;
Edit m_aJavaDriver;
PushButton m_aTestJavaDriver;
FixedText* m_pFL3;
FixedText* m_pJavaDriverLabel;
Edit* m_pJavaDriver;
PushButton* m_pTestJavaDriver;
// connection test
PushButton m_aTestConnection;
PushButton* m_pTestConnection;
// called when the test connection button was clicked
DECL_LINK(OnTestJavaClickHdl,PushButton*);
......@@ -74,11 +72,6 @@ namespace dbaui
// nControlFlags is a combination of the CBTP_xxx-constants
virtual ~OConnectionTabPage();
// <method>OGenericAdministrationPage::fillControls</method>
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
// <method>OGenericAdministrationPage::fillWindows</method>
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
/** enables the test connection button, if allowed
*/
......
dbaccess/source/ui/dlg/ConnectionPage.src
Dosyayı görüntüle @ 020e2839
......@@ -19,118 +19,8 @@
#include "dbaccess_helpid.hrc"
#include "dbu_dlg.hrc"
#include "ConnectionPage.hrc"
#include "AutoControls.hrc"
TabPage PAGE_CONNECTION
{
HelpID = "dbaccess:TabPage:PAGE_CONNECTION";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
Hide = TRUE;
FixedLine FL_SEPARATOR1
{
Pos = MAP_APPFONT ( 4 , UNRELATED_CONTROLS ) ;
Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
Text[ en-US ] = "General";
};
AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL, HID_DSADMIN_BROWSECONN)
FixedText FT_NO_ADDITIONAL_SETTINGS
{
Hide = TRUE;
WordBreak = TRUE;
Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
Size = MAP_APPFONT ( PAGE_X - 12 , 3*FIXEDTEXT_HEIGHT ) ;
};
FixedText FT_HOSTNAME
{
Hide = TRUE;
Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ;
Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ;
Text[ en-US ] = "~Host name";
};
FixedLine FL_SEPARATOR2
{
Pos = MAP_APPFONT ( 4 , 3*FIXEDTEXT_HEIGHT + 3*UNRELATED_CONTROLS + RELATED_CONTROLS ) ;
Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
Text[ en-US ] = "User authentication";
};
FixedText FT_USERNAME
{
Pos = MAP_APPFONT ( 6 , 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ;
Size = MAP_APPFONT ( 90 - 12 , FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "~User name" ;
};
Edit ET_USERNAME
{
HelpID = "dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 90 , 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS -1 ) ;
Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
TabStop = TRUE ;
};
CheckBox CB_PASSWORD_REQUIRED
{
HelpID = "dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED";
Pos = MAP_APPFONT ( 90 , 4*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ;
Size = MAP_APPFONT ( 105 , CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Password required";
};
FixedLine FL_SEPARATOR3
{
Pos = MAP_APPFONT ( 4 , 5*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS + CHECKBOX_HEIGHT) ;
Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
Text[ en-US ] = "JDBC properties";
};
FixedText FT_JDBCDRIVERCLASS
{
Pos = MAP_APPFONT ( 6 , 5*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS + CHECKBOX_HEIGHT) ;
Size = MAP_APPFONT ( 90 - 12 , FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "~JDBC driver class" ;
};
Edit ET_JDBCDRIVERCLASS
{
Border = TRUE ;
Pos = MAP_APPFONT ( 90 , 5*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS + CHECKBOX_HEIGHT -1) ;
Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
TabStop = TRUE ;
HelpId = HID_DSADMIN_DRIVERCLASS;
};
PushButton PB_TESTDRIVERCLASS
{
HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTDRIVERCLASS";
TabStop = TRUE ;
Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , 5*UNRELATED_CONTROLS + 6*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS + CHECKBOX_HEIGHT -2 ) ;
Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
Text [ en-US ] = "Test Class" ;
};
PushButton PB_TESTCONNECTION
{
HelpID = "dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION";
Pos = MAP_APPFONT ( PAGE_X - 75 - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS) ;
Size = MAP_APPFONT ( 75 , BUTTON_HEIGHT ) ;
TabStop = TRUE ;
Text [ en-US ] = "Test Connection";
};
};
String STR_CONNECTION_TEST
{
Text [ en-US ] = "Connection Test";
......
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
Dosyayı görüntüle @ 020e2839
......@@ -67,27 +67,27 @@ namespace dbaui
OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE);
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE);
}
OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE);
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE);
}
OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL);
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL);
}
OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE);
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE);
}
OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/connectionpage.ui", _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL);
return new OConnectionTabPageSetup( pParent, "ConnectionPage", "dbaccess/ui/dbwizconnectionpage.ui", _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL);
}
// OConnectionTabPageSetup
......
dbaccess/source/ui/inc/dbu_resource.hrc
Dosyayı görüntüle @ 020e2839
......@@ -93,7 +93,6 @@
#define PAGE_ODBC RID_PAGE_START + 3
#define PAGE_TEXT RID_PAGE_START + 4
// FREE
#define PAGE_CONNECTION RID_PAGE_START + 6
#define PAGE_ADO RID_PAGE_START + 7
// FREE
#define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10
......
dbaccess/uiconfig/ui/dbwizconnectionpage.ui 0 → 100644
Dosyayı görüntüle @ 020e2839
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="ConnectionPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="header">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_bottom">12</property>
<attributes>
<attribute name="weight" value="semibold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="helptext">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">6</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">label</property>
<property name="wrap">True</property>
<property name="max_width_chars">60</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="browseurllabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Path to the dBASE files</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="dbulo-ConnectionURLEdit" id="browseurl">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">•</property>
<property name="invisible_char_set">True</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="GtkButton" id="create">
<property name="label" translatable="yes">_Create New</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>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</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="GtkButton" id="browse">
<property name="label" translatable="yes">_Browse</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>
<property name="use_action_appearance">False</property>
<property name="use_underline">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">2</property>
</packing>
</child>
</object>
</interface>
extensions/source/abpilot/abspilot.cxx
Dosyayı görüntüle @ 020e2839
......@@ -128,7 +128,7 @@ namespace abp
typeSelectionChanged( m_aSettings.eType );
OUString sDialogTitle = ModuleRes(RID_STR_ABSOURCEDIALOGTITLE).toString();
SetText(sDialogTitle);
setTitleBase(sDialogTitle);
SetHelpId(HID_ABSPILOT);
}
......
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