From kde-commits Wed Apr 30 21:50:48 2014 From: Jaroslaw Staniek Date: Wed, 30 Apr 2014 21:50:48 +0000 To: kde-commits Subject: [calligra] kexi: Remove a number of Qt3/KDElibs3 deps from Kexi Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=139889466032673 Git commit 5a08beea3100349299cadb38f807b5b1def11f92 by Jaroslaw Staniek. Committed on 23/04/2014 at 23:34. Pushed by staniek into branch 'master'. Remove a number of Qt3/KDElibs3 deps from Kexi - linking against Qt3Support - remove deps from ui files and port dependent code - by the way, better look of the connection editor REVIEW:117913 M +0 -1 kexi/formeditor/CMakeLists.txt M +0 -4 kexi/formeditor/factories/CMakeLists.txt M +0 -7 kexi/kexiutils/CMakeLists.txt M +0 -4 kexi/main/CMakeLists.txt D +0 -382 kexi/main/kexifinddialog.ui M +0 -1 kexi/main/startup/KexiMainImportExportPage.ui M +0 -1 kexi/main/startup/KexiProjectStorageTypeSelectionPage.ui M +0 -1 kexi/migration/CMakeLists.txt M +1 -3 kexi/migration/importwizard.cpp M +6 -1 kexi/migration/migratemanager.cpp M +0 -4 kexi/plugins/forms/CMakeLists.txt M +0 -1 kexi/plugins/forms/widgets/mapbrowser/CMakeLists.txt M +0 -1 kexi/plugins/forms/widgets/webbrowser/CMakeLists.txt M +0 -1 kexi/plugins/importexport/csv/CMakeLists.txt M +0 -1 kexi/plugins/relations/CMakeLists.txt M +7 -8 kexi/widget/KexiConnectionSelectorWidget.cpp M +1 -1 kexi/widget/KexiConnectionSelectorWidget.h M +14 -13 kexi/widget/kexidbconnectionwidget.cpp M +1 -1 kexi/widget/kexidbconnectionwidget.h M +254 -268 kexi/widget/kexidbconnectionwidget.ui M +5 -6 kexi/widget/kexiprjtypeselector.cpp M +2 -2 kexi/widget/kexiprjtypeselector.h M +98 -146 kexi/widget/kexiprjtypeselector.ui http://commits.kde.org/calligra/5a08beea3100349299cadb38f807b5b1def11f92 diff --git a/kexi/formeditor/CMakeLists.txt b/kexi/formeditor/CMakeLists.txt index b32f5c6..aa96a97e 100644 --- a/kexi/formeditor/CMakeLists.txt +++ b/kexi/formeditor/CMakeLists.txt @@ -43,7 +43,6 @@ set(kformdesigner_LIBS kexicore kexiextendedwidgets ${CALLIGRADB_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} ) = # enable to add signal/slot connections diff --git a/kexi/formeditor/factories/CMakeLists.txt b/kexi/formeditor/fac= tories/CMakeLists.txt index d06a3af..635852d 100644 --- a/kexi/formeditor/factories/CMakeLists.txt +++ b/kexi/formeditor/factories/CMakeLists.txt @@ -17,11 +17,9 @@ target_link_libraries( kundo2 ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} - ${QT_QT3SUPPORT_LIBRARY} ) = install(TARGETS kformdesigner_containers DESTINATION ${PLUGIN_INSTALL_DIR= }) @@ -41,10 +39,8 @@ target_link_libraries( ${KOPROPERTY_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} - ${QT_QT3SUPPORT_LIBRARY} ) = install(TARGETS kformdesigner_stdwidgets DESTINATION ${PLUGIN_INSTALL_DIR= }) diff --git a/kexi/kexiutils/CMakeLists.txt b/kexi/kexiutils/CMakeLists.txt index 84e1547..f04ff0a 100644 --- a/kexi/kexiutils/CMakeLists.txt +++ b/kexi/kexiutils/CMakeLists.txt @@ -48,13 +48,6 @@ kde4_add_library(kexiutils SHARED ${kexiutils_LIB_SRCS}) target_link_libraries(kexiutils ${CALLIGRADB_LIBS} ${KDE4_KIO_LIBS} ) target_link_libraries(kexiutils LINK_INTERFACE_LIBRARIES ${KDE4_KIO_LIBS}) = -IF (KEXI_MOBILE) - = -ELSE (KEXI_MOBILE) - target_link_libraries(kexiutils ${KDE4_KDE3SUPPORT_LIBS} ) - target_link_libraries(kexiutils LINK_INTERFACE_LIBRARIES ${KDE4_KDE3SUP= PORT_LIBS}) -ENDIF (KEXI_MOBILE) - set_target_properties(kexiutils PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_L= IB_SOVERSION} ) diff --git a/kexi/main/CMakeLists.txt b/kexi/main/CMakeLists.txt index 11e2102..6553d22 100644 --- a/kexi/main/CMakeLists.txt +++ b/kexi/main/CMakeLists.txt @@ -44,9 +44,7 @@ startup/KexiPasswordPage.cpp ) = kde4_add_ui_files(keximain_LIB_SRCS - kexifinddialog.ui startup/KexiProjectStorageTypeSelectionPage.ui - startup/KexiOpenExistingFile.ui startup/KexiServerDBNamePage.ui startup/KexiMainImportExportPage.ui ) @@ -65,8 +63,6 @@ target_link_libraries( ${KDE4_KNEWSTUFF_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KFILE_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} - ${QT_QT3SUPPORT_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ) = diff --git a/kexi/main/kexifinddialog.ui b/kexi/main/kexifinddialog.ui deleted file mode 100644 index 09b570d..0000000 --- a/kexi/main/kexifinddialog.ui +++ /dev/null @@ -1,382 +0,0 @@ - - KexiFindDialog - - - - 0 - 0 - 498 - 264 - - - - Find - - - - - - Fi&nd: - - - false - - - m_textToFind - - - - - - - - 1 - 0 - - - - false - - - true - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - - - - - - true - - - true - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - &Replace - - - - - - - - 0 - 0 - - - - Replace All - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - - - - 0 - 0 - - - - Re&place with: - - - false - - - m_textToReplace - - - - - - - false - - - true - - - - - - - &Look in: - - - false - - - m_lookIn - - - - - - - Qt::StrongFocus - - - - - - - &Search: - - - false - - - m_search - - - - - - - Qt::StrongFocus - - - - Up - - - - - Down - - - - - All Rows - - - - - - - - &Match: - - - false - - - m_match - - - - - - - Qt::StrongFocus - - - - Any Part of Field - - - - - Whole Field - - - - - Start of Field - - - - - - - - Qt::WheelFocus - - - C&ase sensitive - - - - - - - Qt::WheelFocus - - - &Whole words only - - - - - - - Qt::WheelFocus - - - Prompt on replace - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 113 - 5 - - - - - - - - - - - false - - - - - - - - - KComboBox - QComboBox -
kcombobox.h
- - - KHistoryComboBox - KComboBox -
khistorycombobox.h
- - - KPushButton - QPushButton -
kpushbutton.h
- - - - m_textToFind - m_textToReplace - m_btnFind - m_btnClose - m_btnReplace - m_btnReplaceAll - m_lookIn - m_search - m_match - m_caseSensitive - m_wholeWords - m_promptOnReplace - - - kcombobox.h - kpushbutton.h - kpushbutton.h - kpushbutton.h - kpushbutton.h - kcombobox.h - kcombobox.h - kcombobox.h - klineedit.h - kcombobox.h - klineedit.h - - - - - m_btnClose - clicked() - KexiFindDialog - reject() - - - 20 - 20 - - - 20 - 20 - - - - - diff --git a/kexi/main/startup/KexiMainImportExportPage.ui b/kexi/main/star= tup/KexiMainImportExportPage.ui index 5a24e36..7812940 100644 --- a/kexi/main/startup/KexiMainImportExportPage.ui +++ b/kexi/main/startup/KexiMainImportExportPage.ui @@ -67,7 +67,6 @@ - k3listview.h diff --git a/kexi/main/startup/KexiProjectStorageTypeSelectionPage.ui b/kex= i/main/startup/KexiProjectStorageTypeSelectionPage.ui index ac3e04e..69d7f77 100644 --- a/kexi/main/startup/KexiProjectStorageTypeSelectionPage.ui +++ b/kexi/main/startup/KexiProjectStorageTypeSelectionPage.ui @@ -77,7 +77,6 @@ - k3listview.h diff --git a/kexi/migration/CMakeLists.txt b/kexi/migration/CMakeLists.txt index b84ad51..2478b10 100644 --- a/kexi/migration/CMakeLists.txt +++ b/kexi/migration/CMakeLists.txt @@ -53,7 +53,6 @@ target_link_libraries( ${CALLIGRADB_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTGUI_LIBRARY} ) = diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.= cpp index 6dfc449..bc70da6 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -620,9 +620,7 @@ bool ImportWizard::fileBasedSrcSelected() const = bool ImportWizard::fileBasedDstSelected() const { - - return d->dstPrjTypeSelector->buttonGroup->selectedId() =3D=3D 1; - + return d->dstPrjTypeSelector->option_file->isChecked(); } = void ImportWizard::progressUpdated(int percent) diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemana= ger.cpp index 5daa20f..f685e90 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -23,6 +23,8 @@ #include "migratemanager_p.h" #include "keximigrate.h" = +#include + //#include #include #include @@ -71,8 +73,11 @@ MigrateManagerInternal::~MigrateManagerInternal() = void MigrateManagerInternal::slotAppQuits() { - if (qApp->mainWidget() && qApp->mainWidget()->isVisible()) + if (KexiMainWindowIface::global() && KexiMainWindowIface::global()->th= isWidget() + && KexiMainWindowIface::global()->thisWidget()->isVisible()) + { return; //what a hack! - we give up when app is still there + } KexiDBDbg << "let's clear drivers..."; m_drivers.clear(); qDeleteAll(m_drivers); diff --git a/kexi/plugins/forms/CMakeLists.txt b/kexi/plugins/forms/CMakeLi= sts.txt index 5166184..3dbd3b7 100644 --- a/kexi/plugins/forms/CMakeLists.txt +++ b/kexi/plugins/forms/CMakeLists.txt @@ -31,7 +31,6 @@ target_link_libraries( ${KOPROPERTY_LIBS} kexiformutils ${KDE4_KDECORE_LIBS} - ${QT_QT3SUPPORT_LIBRARY} ) = install(TARGETS kexihandler_form DESTINATION ${PLUGIN_INSTALL_DIR}) @@ -59,7 +58,6 @@ target_link_libraries( ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} - ${QT_QT3SUPPORT_LIBRARY} ) = install(TARGETS kformdesigner_kexidbwidgets DESTINATION ${PLUGIN_INSTALL_= DIR}) @@ -120,10 +118,8 @@ target_link_libraries( ${KOPROPERTY_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} - ${QT_QT3SUPPORT_LIBRARY} ) = set_target_properties(kexiformutils PROPERTIES VERSION ${GENERIC_CALLIGRA_= LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} ) diff --git a/kexi/plugins/forms/widgets/mapbrowser/CMakeLists.txt b/kexi/pl= ugins/forms/widgets/mapbrowser/CMakeLists.txt index 5ccd67f..fd29579 100644 --- a/kexi/plugins/forms/widgets/mapbrowser/CMakeLists.txt +++ b/kexi/plugins/forms/widgets/mapbrowser/CMakeLists.txt @@ -26,7 +26,6 @@ target_link_libraries( ${MARBLE_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} diff --git a/kexi/plugins/forms/widgets/webbrowser/CMakeLists.txt b/kexi/pl= ugins/forms/widgets/webbrowser/CMakeLists.txt index b251427..d8c61a6 100644 --- a/kexi/plugins/forms/widgets/webbrowser/CMakeLists.txt +++ b/kexi/plugins/forms/widgets/webbrowser/CMakeLists.txt @@ -22,7 +22,6 @@ target_link_libraries( ${KOPROPERTY_LIBS} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTWEBKIT_LIBRARY} diff --git a/kexi/plugins/importexport/csv/CMakeLists.txt b/kexi/plugins/im= portexport/csv/CMakeLists.txt index b537de6..3c25a71 100644 --- a/kexi/plugins/importexport/csv/CMakeLists.txt +++ b/kexi/plugins/importexport/csv/CMakeLists.txt @@ -30,7 +30,6 @@ target_link_libraries( ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KFILE_LIBS} - ${KDE4_KDE3SUPPORT_LIBS} ${QT_QTGUI_LIBRARY} ) = diff --git a/kexi/plugins/relations/CMakeLists.txt b/kexi/plugins/relations= /CMakeLists.txt index 0330ba6..821eba9 100644 --- a/kexi/plugins/relations/CMakeLists.txt +++ b/kexi/plugins/relations/CMakeLists.txt @@ -18,7 +18,6 @@ target_link_libraries( kexidb ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} - ${QT_QT3SUPPORT_LIBRARY} ) = install(TARGETS kexihandler_relation DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/kexi/widget/KexiConnectionSelectorWidget.cpp b/kexi/widget/Kex= iConnectionSelectorWidget.cpp index 32b1d7d..d036511 100644 --- a/kexi/widget/KexiConnectionSelectorWidget.cpp +++ b/kexi/widget/KexiConnectionSelectorWidget.cpp @@ -150,8 +150,8 @@ KexiConnectionSelectorWidget::KexiConnectionSelectorWid= get( // QLabel* lbl =3D new QLabel(i18n("Select existing Kexi project to ope= n:"), openExistingWidget); // openExistingWidgetLyr->addWidget( lbl ); d->prjTypeSelector =3D new KexiPrjTypeSelector(d->openExistingWidget); - connect(d->prjTypeSelector->buttonGroup, SIGNAL(clicked(int)), - this, SLOT(slotPrjTypeSelected(int))); + connect(d->prjTypeSelector->buttonGroup, SIGNAL(buttonClicked(QAbstrac= tButton*)), + this, SLOT(slotPrjTypeSelected(QAbstractButton*))); openExistingWidgetLyr->addWidget(d->prjTypeSelector); d->prjTypeSelector->setContentsMargins(0, 0, 0, KDialog::spacingHint()= ); //openExistingWidgetLyr->addSpacing(KDialog::spacingHint()); @@ -196,16 +196,15 @@ KexiConnectionSelectorWidget::~KexiConnectionSelector= Widget() = void KexiConnectionSelectorWidget::showAdvancedConn() { - slotPrjTypeSelected(2); - d->prjTypeSelector->buttonGroup->setButton(2); + d->prjTypeSelector->option_server->setChecked(true); } = //void KexiConnectionSelectorWidget::showAdvancedConn() -void KexiConnectionSelectorWidget::slotPrjTypeSelected(int id) +void KexiConnectionSelectorWidget::slotPrjTypeSelected(QAbstractButton *bt= n) { - if (id =3D=3D 1) {//file-based prj type + if (btn =3D=3D d->prjTypeSelector->option_file) { //file-based prj type showSimpleConn(); - } else if (id =3D=3D 2) {//server-based prj type + } else if (btn =3D=3D d->prjTypeSelector->option_server) { //server-ba= sed prj type if (KexiDB::hasDatabaseServerDrivers()) { if (!d->conn_sel_shown) { d->conn_sel_shown =3D true; @@ -258,7 +257,7 @@ ConnectionDataLVItem* KexiConnectionSelectorWidget::add= ConnectionData(KexiDB::Co = void KexiConnectionSelectorWidget::showSimpleConn() { - d->prjTypeSelector->buttonGroup->setButton(1); + d->prjTypeSelector->option_file->setChecked(true); if (!d->file_sel_shown) { d->file_sel_shown =3D true; fileWidget =3D new KexiFileWidget( diff --git a/kexi/widget/KexiConnectionSelectorWidget.h b/kexi/widget/KexiC= onnectionSelectorWidget.h index 550df55..89da460 100644 --- a/kexi/widget/KexiConnectionSelectorWidget.h +++ b/kexi/widget/KexiConnectionSelectorWidget.h @@ -139,7 +139,7 @@ protected slots: void slotRemoteEditBtnClicked(); void slotRemoteRemoveBtnClicked(); void slotConnectionSelectionChanged(); - void slotPrjTypeSelected(int id); + void slotPrjTypeSelected(QAbstractButton *btn); void slotConnectionSelected(); = protected: diff --git a/kexi/widget/kexidbconnectionwidget.cpp b/kexi/widget/kexidbcon= nectionwidget.cpp index db6c77c..448e3c0 100644 --- a/kexi/widget/kexidbconnectionwidget.cpp +++ b/kexi/widget/kexidbconnectionwidget.cpp @@ -1,5 +1,5 @@ /* This file is part of the KDE project - Copyright (C) 2005 Jaros=C5=82aw Staniek + Copyright (C) 2005-2014 Jaros=C5=82aw Staniek = This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -109,7 +109,7 @@ KexiDBConnectionWidget::KexiDBConnectionWidget(QWidget*= parent) d->btnSaveChanges->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixe= d); = d->btnTestConnection =3D new KPushButton( -// @todo add Test Connection icon +//! @todo add Test Connection icon KGuiItem(i18n("&Test Connection"), QString(), i18n("Test database connection"), i18n("Tests database connection. " @@ -120,7 +120,8 @@ KexiDBConnectionWidget::KexiDBConnectionWidget(QWidget*= parent) setTabOrder(d->btnSaveChanges, d->btnTestConnection); d->btnTestConnection->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::F= ixed); = - connect(locationBGrp, SIGNAL(clicked(int)), this, SLOT(slotLocationBGr= pClicked(int))); + connect(localhostRBtn, SIGNAL(clicked()), this, SLOT(slotLocationRadio= Clicked())); + connect(remotehostRBtn, SIGNAL(clicked()), this, SLOT(slotLocationRadi= oClicked())); connect(chkPortDefault, SIGNAL(toggled(bool)), this , SLOT(slotCBToggl= ed(bool))); connect(btnLoadDBList, SIGNAL(clicked()), this, SIGNAL(loadDBList())); connect(d->btnSaveChanges, SIGNAL(clicked()), this, SIGNAL(saveChanges= ())); @@ -159,8 +160,13 @@ void KexiDBConnectionWidget::setDataInternal(const Kex= iProjectData& data, bool c //! @todo what if there's no such driver name? d->driversCombo->setDriverName(d->data.connectionData()->driverName); hostEdit->setText(d->data.connectionData()->hostName); - locationBGrp->setButton(d->data.connectionData()->hostName.isEmpty() ?= 0 : 1); - slotLocationBGrpClicked(locationBGrp->selectedId()); + if (d->data.connectionData()->hostName.isEmpty()) { + localhostRBtn->setChecked(true); + } + else { + remotehostRBtn->setChecked(true); + } + slotLocationRadioClicked(); if (d->data.connectionData()->port !=3D 0) { chkPortDefault->setChecked(false); customPortEdit->setValue(d->data.connectionData()->port); @@ -219,12 +225,10 @@ KexiProjectData KexiDBConnectionWidget::data() return d->data; } = -void KexiDBConnectionWidget::slotLocationBGrpClicked(int id) +void KexiDBConnectionWidget::slotLocationRadioClicked() { - if (id !=3D 0 && id !=3D 1) //only support local/remove radio buttons - return; - hostLbl->setEnabled(id =3D=3D 1); - hostEdit->setEnabled(id =3D=3D 1); + hostLbl->setEnabled(remotehostRBtn->isChecked()); + hostEdit->setEnabled(remotehostRBtn->isChecked()); } = void KexiDBConnectionWidget::slotCBToggled(bool on) @@ -232,9 +236,6 @@ void KexiDBConnectionWidget::slotCBToggled(bool on) if (sender() =3D=3D chkPortDefault) { customPortEdit->setEnabled(!on); } -// else if (sender()=3D=3DchkSocketDefault) { -// customSocketEdit->setEnabled(!on); -// } } = //----------- diff --git a/kexi/widget/kexidbconnectionwidget.h b/kexi/widget/kexidbconne= ctionwidget.h index c29f036..7961918 100644 --- a/kexi/widget/kexidbconnectionwidget.h +++ b/kexi/widget/kexidbconnectionwidget.h @@ -72,7 +72,7 @@ signals: void loadDBList(); = protected slots: - void slotLocationBGrpClicked(int id); + void slotLocationRadioClicked(); void slotCBToggled(bool on); = protected: diff --git a/kexi/widget/kexidbconnectionwidget.ui b/kexi/widget/kexidbconn= ectionwidget.ui index 171eff9..f38c442 100644 --- a/kexi/widget/kexidbconnectionwidget.ui +++ b/kexi/widget/kexidbconnectionwidget.ui @@ -1,57 +1,49 @@ - + + KexiDBConnectionWidget - - + + 0 0 - 412 - 414 + 358 + 393 - - + + 0 - - 0 - - - 0 - - - 0 - - - + + - - - + + + 0 0 - + 48 48 - + false - + Qt::Vertical - + QSizePolicy::Expanding - + 20 331 @@ -61,15 +53,15 @@ - + - + Qt::Vertical - + QSizePolicy::Expanding - + 20 4 @@ -77,199 +69,60 @@ - - - - - 0 - 0 - - - - Database Server - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 41 - 20 - - - - - - - - 0 - - - - - - - Port: - - - false - - - - - - - - - - Local server - - - - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 90 - 20 - - - - - - - - &Hostname: - - - false - - - hostEdit - - - - - - - Default - - - 2 - - - - - - - Remote server - - - 1 - - - - - - - Qt::TabFocus - - - &Engine: - - - false - - - frmEngine - - - - - - - Qt::StrongFocus - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - - - - - + + + + 0 0 - + Authentication - - - - + + + + &Username: - + false - + userEdit - - + + - - - + + + &Password: - + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + false - + passwordEdit - - - + + + QLineEdit::Password - - - + + + Save password in the shortcut file @@ -277,87 +130,90 @@ - - - - + + + + 0 0 - + Database - - - - + + + + &Name: - + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + false - + nameCombo - - + + - - - + + + &Title (optional): - - Qt::AlignTop + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + false - + titleEdit - - - - + + + + 0 0 - + 32 32767 - + - - - - + + + + 1 0 - + true - + QComboBox::InsertAtBottom - + false - + false @@ -365,17 +221,17 @@ - - + + - + Qt::Horizontal - + QSizePolicy::Expanding - + 80 20 @@ -384,50 +240,174 @@ - - + + QFrame::NoFrame - + QFrame::Plain + + + + + 0 + 0 + + + + Database Server + + + + + + Qt::TabFocus + + + &Engine: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + frmEngine + + + + + + + + 1 + 0 + + + + Qt::StrongFocus + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + + Local server + + + + + + true + + + + + + + Remote server + + + + + + + + + &Hostname: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + hostEdit + + + + + + + + 0 + 0 + + + + + + + + Port: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + + + 0 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Default + + + + + + + + - - - - Q3GroupBox - QGroupBox -
Qt3Support/Q3GroupBox
- 1 - - - Q3Frame - QFrame -
Qt3Support/Q3Frame
- 1 - - - Q3ButtonGroup - Q3GroupBox -
Qt3Support/Q3ButtonGroup
- 1 - + + KComboBox QComboBox
kcombobox.h
 - KIntNumInput - QWidget -
knuminput.h
- - KLineEdit QLineEdit
klineedit.h
@@ -437,6 +417,11 @@ QPushButton
kpushbutton.h
 + + KIntNumInput + QWidget +
knuminput.h
+ lblEngine @@ -444,6 +429,7 @@ localhostRBtn remotehostRBtn hostEdit + customPortEdit chkPortDefault userEdit passwordEdit @@ -453,11 +439,11 @@ titleEdit - knuminput.h - klineedit.h - kpushbutton.h - kcombobox.h - klineedit.h + knuminput.h + klineedit.h + kpushbutton.h + kcombobox.h + klineedit.h diff --git a/kexi/widget/kexiprjtypeselector.cpp b/kexi/widget/kexiprjtypes= elector.cpp index 66449ed..fc89ca0 100644 --- a/kexi/widget/kexiprjtypeselector.cpp +++ b/kexi/widget/kexiprjtypeselector.cpp @@ -31,25 +31,24 @@ KexiPrjTypeSelector::KexiPrjTypeSelector(QWidget* paren= t) { setupUi(this); setObjectName("KexiPrjTypeSelector"); - QString none; icon_file->setPixmap(KIcon(KexiDB::defaultFileBasedDriverIconName()).p= ixmap(48,48)); icon_file->setFixedSize(icon_file->pixmap()->size() / 2); icon_server->setPixmap(KIcon(KEXI_DATABASE_SERVER_ICON_NAME).pixmap(48= ,48)); icon_server->setFixedSize(icon_server->pixmap()->size() / 2); = - connect(buttonGroup, SIGNAL(clicked(int)), - this, SLOT(slotSelectionChanged(int))); + connect(buttonGroup, SIGNAL(buttonClicked(QAbstractButton*)), + this, SLOT(slotSelectionChanged(QAbstractButton*))); = - slotSelectionChanged(1); + slotSelectionChanged(option_file); } = KexiPrjTypeSelector::~KexiPrjTypeSelector() { } = -void KexiPrjTypeSelector::slotSelectionChanged(int id) +void KexiPrjTypeSelector::slotSelectionChanged(QAbstractButton *btn) { - frame_server->setEnabled(id =3D=3D 2); + frame_server->setEnabled(btn =3D=3D option_server); } = #include "kexiprjtypeselector.moc" diff --git a/kexi/widget/kexiprjtypeselector.h b/kexi/widget/kexiprjtypesel= ector.h index 2608dcc..6cea5dd 100644 --- a/kexi/widget/kexiprjtypeselector.h +++ b/kexi/widget/kexiprjtypeselector.h @@ -31,11 +31,11 @@ class KEXIEXTWIDGETS_EXPORT KexiPrjTypeSelector Q_OBJECT = public: - KexiPrjTypeSelector(QWidget* parent =3D 0); + explicit KexiPrjTypeSelector(QWidget* parent =3D 0); ~KexiPrjTypeSelector(); = public slots: - void slotSelectionChanged(int id); + void slotSelectionChanged(QAbstractButton *btn); }; = #endif // KEXIPRJTYPESELECTOR_H diff --git a/kexi/widget/kexiprjtypeselector.ui b/kexi/widget/kexiprjtypese= lector.ui index bdf472e..f59d755 100644 --- a/kexi/widget/kexiprjtypeselector.ui +++ b/kexi/widget/kexiprjtypeselector.ui @@ -1,147 +1,99 @@ - - - - - KexiPrjTypeSelector - - - - 0 - 0 - 254 - 61 - - - - - 0 - - - - - Q3GroupBox::NoFrame - - - Q3GroupBox::Plain - - - 0 - - - - - - 1 - - - - 0 - - - - - Projects stored on a database server - - - 2 - - - - - - - Projects stored in a file - - - true - - - 1 - - - - - - - - 0 - 5 - 0 - 0 - - - - - - - true - - - Qt::AlignVCenter|Qt::AlignLeft - - - false - - - - - - - - 0 - 5 - 0 - 0 - - - - - - - true - - - Qt::AlignVCenter|Qt::AlignLeft - - - false - - - - - - - - 5 - 1 - 0 - 0 - - - - NoFrame - - - Plain - - - - - - - - - - - option_file - option_server - - - - buttonGroup - clicked(int) - KexiPrjTypeSelectorBase - slotSelectionChanged(int) - - + + + KexiPrjTypeSelector + + + + 0 + 0 + 259 + 68 + + + + + + + + 0 + 0 + + + + + + + true + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + + Projects stored in a file + + + true + + + buttonGroup + + + + + + + + 0 + 0 + + + + + + + true + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + false + + + + + + + Projects stored on a database server + + + buttonGroup + + + + + + + + 0 + 0 + + + + + + + + + + + +