[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra] kexi: Remove a number of Qt3/KDElibs3 deps from Kexi
From: Jaroslaw Staniek <staniek () kde ! org>
Date: 2014-04-30 21:50:48
Message-ID: E1WfcOu-0005F8-Dx () scm ! kde ! org
[Download RAW message or body]
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/factories/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_KDE3SUPPORT_LIBS})
-ENDIF (KEXI_MOBILE)
-
set_target_properties(kexiutils PROPERTIES
VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION \
${GENERIC_CALLIGRA_LIB_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 @@
-<ui version="4.0" >
- <class>KexiFindDialog</class>
- <widget class="QDialog" name="KexiFindDialog" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>498</width>
- <height>264</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Find</string>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
- <string>Fi&nd:</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- <property name="buddy" >
- <cstring>m_textToFind</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2" >
- <widget class="KHistoryComboBox" name="m_textToFind" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="duplicatesEnabled" >
- <bool>false</bool>
- </property>
- <property name="autoCompletion" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item rowspan="8" row="0" column="3" >
- <layout class="QVBoxLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item>
- <widget class="KPushButton" name="m_btnFind" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="shortcut" >
- <string/>
- </property>
- <property name="autoDefault" >
- <bool>true</bool>
- </property>
- <property name="default" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KPushButton" name="m_btnClose" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KPushButton" name="m_btnReplace" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>&Replace</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KPushButton" name="m_btnReplaceAll" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Replace All</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="m_replaceLbl" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Re&place with:</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- <property name="buddy" >
- <cstring>m_textToReplace</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1" colspan="2" >
- <widget class="KHistoryComboBox" name="m_textToReplace" >
- <property name="duplicatesEnabled" >
- <bool>false</bool>
- </property>
- <property name="autoCompletion" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel2_2" >
- <property name="text" >
- <string>&Look in:</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- <property name="buddy" >
- <cstring>m_lookIn</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="KComboBox" name="m_lookIn" >
- <property name="focusPolicy" >
- <enum>Qt::StrongFocus</enum>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="textLabel2_2_2" >
- <property name="text" >
- <string>&Search:</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- <property name="buddy" >
- <cstring>m_search</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="KComboBox" name="m_search" >
- <property name="focusPolicy" >
- <enum>Qt::StrongFocus</enum>
- </property>
- <item>
- <property name="text" >
- <string>Up</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Down</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>All Rows</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="4" column="0" >
- <widget class="QLabel" name="textLabel2_2_3" >
- <property name="text" >
- <string>&Match:</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- <property name="buddy" >
- <cstring>m_match</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="KComboBox" name="m_match" >
- <property name="focusPolicy" >
- <enum>Qt::StrongFocus</enum>
- </property>
- <item>
- <property name="text" >
- <string>Any Part of Field</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Whole Field</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Start of Field</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="4" column="2" >
- <widget class="QCheckBox" name="m_caseSensitive" >
- <property name="focusPolicy" >
- <enum>Qt::WheelFocus</enum>
- </property>
- <property name="text" >
- <string>C&ase sensitive</string>
- </property>
- </widget>
- </item>
- <item row="5" column="2" >
- <widget class="QCheckBox" name="m_wholeWords" >
- <property name="focusPolicy" >
- <enum>Qt::WheelFocus</enum>
- </property>
- <property name="text" >
- <string>&Whole words only</string>
- </property>
- </widget>
- </item>
- <item row="6" column="2" >
- <widget class="QCheckBox" name="m_promptOnReplace" >
- <property name="focusPolicy" >
- <enum>Qt::WheelFocus</enum>
- </property>
- <property name="text" >
- <string>Prompt on replace</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="7" column="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>113</width>
- <height>5</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="8" column="0" colspan="4" >
- <widget class="QLabel" name="m_messageLabel" >
- <property name="text" >
- <string/>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <customwidgets>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
- <customwidget>
- <class>KHistoryComboBox</class>
- <extends>KComboBox</extends>
- <header>khistorycombobox.h</header>
- </customwidget>
- <customwidget>
- <class>KPushButton</class>
- <extends>QPushButton</extends>
- <header>kpushbutton.h</header>
- </customwidget>
- </customwidgets>
- <tabstops>
- <tabstop>m_textToFind</tabstop>
- <tabstop>m_textToReplace</tabstop>
- <tabstop>m_btnFind</tabstop>
- <tabstop>m_btnClose</tabstop>
- <tabstop>m_btnReplace</tabstop>
- <tabstop>m_btnReplaceAll</tabstop>
- <tabstop>m_lookIn</tabstop>
- <tabstop>m_search</tabstop>
- <tabstop>m_match</tabstop>
- <tabstop>m_caseSensitive</tabstop>
- <tabstop>m_wholeWords</tabstop>
- <tabstop>m_promptOnReplace</tabstop>
- </tabstops>
- <includes>
- <include location="local" >kcombobox.h</include>
- <include location="local" >kpushbutton.h</include>
- <include location="local" >kpushbutton.h</include>
- <include location="local" >kpushbutton.h</include>
- <include location="local" >kpushbutton.h</include>
- <include location="local" >kcombobox.h</include>
- <include location="local" >kcombobox.h</include>
- <include location="local" >kcombobox.h</include>
- <include location="local" >klineedit.h</include>
- <include location="local" >kcombobox.h</include>
- <include location="local" >klineedit.h</include>
- </includes>
- <resources/>
- <connections>
- <connection>
- <sender>m_btnClose</sender>
- <signal>clicked()</signal>
- <receiver>KexiFindDialog</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>20</x>
- <y>20</y>
- </hint>
- <hint type="destinationlabel" >
- <x>20</x>
- <y>20</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff --git a/kexi/main/startup/KexiMainImportExportPage.ui \
b/kexi/main/startup/KexiMainImportExportPage.ui index 5a24e36..7812940 100644
--- a/kexi/main/startup/KexiMainImportExportPage.ui
+++ b/kexi/main/startup/KexiMainImportExportPage.ui
@@ -67,7 +67,6 @@
</customwidget>
</customwidgets>
<includes>
- <include location="local">k3listview.h</include>
</includes>
<resources/>
<connections/>
diff --git a/kexi/main/startup/KexiProjectStorageTypeSelectionPage.ui \
b/kexi/main/startup/KexiProjectStorageTypeSelectionPage.ui index ac3e04e..69d7f77 \
100644
--- a/kexi/main/startup/KexiProjectStorageTypeSelectionPage.ui
+++ b/kexi/main/startup/KexiProjectStorageTypeSelectionPage.ui
@@ -77,7 +77,6 @@
</customwidget>
</customwidgets>
<includes>
- <include location="local">k3listview.h</include>
</includes>
<resources/>
<connections/>
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() == 1;
-
+ return d->dstPrjTypeSelector->option_file->isChecked();
}
void ImportWizard::progressUpdated(int percent)
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.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 <core/KexiMainWindowIface.h>
+
//#include <klibloader.h>
#include <ktrader.h>
#include <kdebug.h>
@@ -71,8 +73,11 @@ MigrateManagerInternal::~MigrateManagerInternal()
void MigrateManagerInternal::slotAppQuits()
{
- if (qApp->mainWidget() && qApp->mainWidget()->isVisible())
+ if (KexiMainWindowIface::global() && KexiMainWindowIface::global()->thisWidget()
+ && 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/CMakeLists.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/plugins/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/plugins/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/importexport/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/KexiConnectionSelectorWidget.cpp index 32b1d7d..d036511 100644
--- a/kexi/widget/KexiConnectionSelectorWidget.cpp
+++ b/kexi/widget/KexiConnectionSelectorWidget.cpp
@@ -150,8 +150,8 @@ KexiConnectionSelectorWidget::KexiConnectionSelectorWidget(
// QLabel* lbl = new QLabel(i18n("<b>Select existing Kexi project to open:</b>"), \
openExistingWidget); // openExistingWidgetLyr->addWidget( lbl );
d->prjTypeSelector = new KexiPrjTypeSelector(d->openExistingWidget);
- connect(d->prjTypeSelector->buttonGroup, SIGNAL(clicked(int)),
- this, SLOT(slotPrjTypeSelected(int)));
+ connect(d->prjTypeSelector->buttonGroup, \
SIGNAL(buttonClicked(QAbstractButton*)), + 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::~KexiConnectionSelectorWidget()
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 *btn)
{
- if (id == 1) {//file-based prj type
+ if (btn == d->prjTypeSelector->option_file) { //file-based prj type
showSimpleConn();
- } else if (id == 2) {//server-based prj type
+ } else if (btn == d->prjTypeSelector->option_server) { //server-based prj type
if (KexiDB::hasDatabaseServerDrivers()) {
if (!d->conn_sel_shown) {
d->conn_sel_shown = true;
@@ -258,7 +257,7 @@ ConnectionDataLVItem* \
KexiConnectionSelectorWidget::addConnectionData(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 = true;
fileWidget = new KexiFileWidget(
diff --git a/kexi/widget/KexiConnectionSelectorWidget.h \
b/kexi/widget/KexiConnectionSelectorWidget.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/kexidbconnectionwidget.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ław Staniek <staniek@kde.org>
+ Copyright (C) 2005-2014 Jarosław Staniek <staniek@kde.org>
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::Fixed);
d->btnTestConnection = 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::Fixed);
- connect(locationBGrp, SIGNAL(clicked(int)), this, \
SLOT(slotLocationBGrpClicked(int))); + connect(localhostRBtn, SIGNAL(clicked()), \
this, SLOT(slotLocationRadioClicked())); + connect(remotehostRBtn, \
SIGNAL(clicked()), this, SLOT(slotLocationRadioClicked()));
connect(chkPortDefault, SIGNAL(toggled(bool)), this , \
SLOT(slotCBToggled(bool)));
connect(btnLoadDBList, SIGNAL(clicked()), this, SIGNAL(loadDBList()));
connect(d->btnSaveChanges, SIGNAL(clicked()), this, SIGNAL(saveChanges()));
@@ -159,8 +160,13 @@ void KexiDBConnectionWidget::setDataInternal(const \
KexiProjectData& 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 != 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 != 0 && id != 1) //only support local/remove radio buttons
- return;
- hostLbl->setEnabled(id == 1);
- hostEdit->setEnabled(id == 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() == chkPortDefault) {
customPortEdit->setEnabled(!on);
}
-// else if (sender()==chkSocketDefault) {
-// customSocketEdit->setEnabled(!on);
-// }
}
//-----------
diff --git a/kexi/widget/kexidbconnectionwidget.h \
b/kexi/widget/kexidbconnectionwidget.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/kexidbconnectionwidget.ui index 171eff9..f38c442 100644
--- a/kexi/widget/kexidbconnectionwidget.ui
+++ b/kexi/widget/kexidbconnectionwidget.ui
@@ -1,57 +1,49 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>KexiDBConnectionWidget</class>
- <widget class="QWidget" name="KexiDBConnectionWidget" >
- <property name="geometry" >
+ <widget class="QWidget" name="KexiDBConnectionWidget">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>412</width>
- <height>414</height>
+ <width>358</width>
+ <height>393</height>
</rect>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
+ <layout class="QGridLayout" name="gridLayout1">
+ <property name="margin">
<number>0</number>
</property>
- <property name="topMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
- <item rowspan="3" row="0" column="0" >
- <layout class="QVBoxLayout" >
+ <item row="0" column="0" rowspan="4">
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="iconLabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <widget class="QLabel" name="iconLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>331</height>
@@ -61,15 +53,15 @@
</item>
</layout>
</item>
- <item row="4" column="1" >
+ <item row="5" column="1">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>4</height>
@@ -77,199 +69,60 @@
</property>
</spacer>
</item>
- <item row="0" column="1" >
- <widget class="Q3ButtonGroup" name="locationBGrp" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title" >
- <string>Database Server</string>
- </property>
- <layout class="QGridLayout" >
- <item row="1" column="5" colspan="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>41</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="4" colspan="2" >
- <widget class="KIntNumInput" name="customPortEdit" >
- <property name="minValue" stdset="0" >
- <number>0</number>
- </property>
- </widget>
- </item>
- <item row="3" column="0" colspan="2" >
- <widget class="QLabel" name="portLbl" >
- <property name="text" >
- <string>Port:</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="2" colspan="5" >
- <widget class="KLineEdit" name="hostEdit" />
- </item>
- <item row="1" column="0" colspan="3" >
- <widget class="QRadioButton" name="localhostRBtn" >
- <property name="text" >
- <string>Local server</string>
- </property>
- <property name="shortcut" >
- <string/>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="6" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>90</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="0" colspan="2" >
- <widget class="QLabel" name="hostLbl" >
- <property name="text" >
- <string>&Hostname:</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- <property name="buddy" >
- <cstring>hostEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="2" colspan="2" >
- <widget class="QCheckBox" name="chkPortDefault" >
- <property name="text" >
- <string comment="port: default" >Default</string>
- </property>
- <property name="buttonGroupId" stdset="0" >
- <number>2</number>
- </property>
- </widget>
- </item>
- <item row="1" column="3" colspan="2" >
- <widget class="QRadioButton" name="remotehostRBtn" >
- <property name="text" >
- <string>Remote server</string>
- </property>
- <property name="buttonGroupId" stdset="0" >
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="lblEngine" >
- <property name="focusPolicy" >
- <enum>Qt::TabFocus</enum>
- </property>
- <property name="text" >
- <string>&Engine:</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- <property name="buddy" >
- <cstring>frmEngine</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1" colspan="6" >
- <widget class="Q3Frame" name="frmEngine" >
- <property name="focusPolicy" >
- <enum>Qt::StrongFocus</enum>
- </property>
- <property name="frameShape" >
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Plain</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="Q3GroupBox" name="authenticationGBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+ <item row="2" column="1">
+ <widget class="QGroupBox" name="authenticationGBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Authentication</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="userLbl" >
- <property name="text" >
+ <layout class="QGridLayout" name="gridLayout2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="userLbl">
+ <property name="text">
<string>&Username:</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>userEdit</cstring>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="KLineEdit" name="userEdit" />
+ <item row="0" column="1">
+ <widget class="KLineEdit" name="userEdit"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="passwordLbl" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="passwordLbl">
+ <property name="text">
<string>&Password:</string>
</property>
- <property name="wordWrap" >
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>passwordEdit</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="KLineEdit" name="passwordEdit" >
- <property name="echoMode" >
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="passwordEdit">
+ <property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QCheckBox" name="chkSavePassword" >
- <property name="text" >
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="chkSavePassword">
+ <property name="text">
<string>Save password in the shortcut file</string>
</property>
</widget>
@@ -277,87 +130,90 @@
</layout>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="Q3GroupBox" name="dbGroupBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+ <item row="3" column="1">
+ <widget class="QGroupBox" name="dbGroupBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title" >
+ <property name="title">
<string>Database</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="nameLabel" >
- <property name="text" >
+ <layout class="QGridLayout" name="gridLayout3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="nameLabel">
+ <property name="text">
<string>&Name:</string>
</property>
- <property name="wordWrap" >
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>nameCombo</cstring>
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2" >
- <widget class="KLineEdit" name="titleEdit" />
+ <item row="1" column="1" colspan="2">
+ <widget class="KLineEdit" name="titleEdit"/>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="titleLabel" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="titleLabel">
+ <property name="text">
<string>&Title (optional):</string>
</property>
- <property name="alignment" >
- <set>Qt::AlignTop</set>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy" >
+ <property name="buddy">
<cstring>titleEdit</cstring>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="KPushButton" name="btnLoadDBList" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Maximum" hsizetype="Fixed" >
+ <item row="0" column="2">
+ <widget class="KPushButton" name="btnLoadDBList">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>32</width>
<height>32767</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="KComboBox" name="nameCombo" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+ <item row="0" column="1">
+ <widget class="KComboBox" name="nameCombo">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="editable" >
+ <property name="editable">
<bool>true</bool>
</property>
- <property name="insertPolicy" >
+ <property name="insertPolicy">
<enum>QComboBox::InsertAtBottom</enum>
</property>
- <property name="autoCompletion" >
+ <property name="autoCompletion">
<bool>false</bool>
</property>
- <property name="trapReturnKey" >
+ <property name="trapReturnKey">
<bool>false</bool>
</property>
</widget>
@@ -365,17 +221,17 @@
</layout>
</widget>
</item>
- <item row="3" column="0" colspan="2" >
- <layout class="QHBoxLayout" >
+ <item row="4" column="0" colspan="2">
+ <layout class="QHBoxLayout">
<item>
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>80</width>
<height>20</height>
@@ -384,50 +240,174 @@
</spacer>
</item>
<item>
- <widget class="Q3Frame" name="frmBottom" >
- <property name="frameShape" >
+ <widget class="QFrame" name="frmBottom">
+ <property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
</widget>
</item>
</layout>
</item>
+ <item row="0" column="1" rowspan="2">
+ <widget class="QGroupBox" name="locationBGrp">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Database Server</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="lblEngine">
+ <property name="focusPolicy">
+ <enum>Qt::TabFocus</enum>
+ </property>
+ <property name="text">
+ <string>&Engine:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ <property name="buddy">
+ <cstring>frmEngine</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QFrame" name="frmEngine">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QRadioButton" name="localhostRBtn">
+ <property name="text">
+ <string>Local server</string>
+ </property>
+ <property name="shortcut">
+ <string/>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="remotehostRBtn">
+ <property name="text">
+ <string>Remote server</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="hostLbl">
+ <property name="text">
+ <string>&Hostname:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ <property name="buddy">
+ <cstring>hostEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KLineEdit" name="hostEdit">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="portLbl">
+ <property name="text">
+ <string>Port:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="KIntNumInput" name="customPortEdit">
+ <property name="minValue" stdset="0">
+ <number>0</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="chkPortDefault">
+ <property name="text">
+ <string comment="port: default">Default</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
- <customwidgets>
- <customwidget>
- <class>Q3GroupBox</class>
- <extends>QGroupBox</extends>
- <header>Qt3Support/Q3GroupBox</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>Q3Frame</class>
- <extends>QFrame</extends>
- <header>Qt3Support/Q3Frame</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>Q3ButtonGroup</class>
- <extends>Q3GroupBox</extends>
- <header>Qt3Support/Q3ButtonGroup</header>
- <container>1</container>
- </customwidget>
+ <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
<customwidget>
<class>KComboBox</class>
<extends>QComboBox</extends>
<header>kcombobox.h</header>
</customwidget>
<customwidget>
- <class>KIntNumInput</class>
- <extends>QWidget</extends>
- <header>knuminput.h</header>
- </customwidget>
- <customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
@@ -437,6 +417,11 @@
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
</customwidget>
+ <customwidget>
+ <class>KIntNumInput</class>
+ <extends>QWidget</extends>
+ <header>knuminput.h</header>
+ </customwidget>
</customwidgets>
<tabstops>
<tabstop>lblEngine</tabstop>
@@ -444,6 +429,7 @@
<tabstop>localhostRBtn</tabstop>
<tabstop>remotehostRBtn</tabstop>
<tabstop>hostEdit</tabstop>
+ <tabstop>customPortEdit</tabstop>
<tabstop>chkPortDefault</tabstop>
<tabstop>userEdit</tabstop>
<tabstop>passwordEdit</tabstop>
@@ -453,11 +439,11 @@
<tabstop>titleEdit</tabstop>
</tabstops>
<includes>
- <include location="local" >knuminput.h</include>
- <include location="local" >klineedit.h</include>
- <include location="local" >kpushbutton.h</include>
- <include location="local" >kcombobox.h</include>
- <include location="local" >klineedit.h</include>
+ <include location="local">knuminput.h</include>
+ <include location="local">klineedit.h</include>
+ <include location="local">kpushbutton.h</include>
+ <include location="local">kcombobox.h</include>
+ <include location="local">klineedit.h</include>
</includes>
<resources/>
<connections/>
diff --git a/kexi/widget/kexiprjtypeselector.cpp \
b/kexi/widget/kexiprjtypeselector.cpp index 66449ed..fc89ca0 100644
--- a/kexi/widget/kexiprjtypeselector.cpp
+++ b/kexi/widget/kexiprjtypeselector.cpp
@@ -31,25 +31,24 @@ KexiPrjTypeSelector::KexiPrjTypeSelector(QWidget* parent)
{
setupUi(this);
setObjectName("KexiPrjTypeSelector");
- QString none;
icon_file->setPixmap(KIcon(KexiDB::defaultFileBasedDriverIconName()).pixmap(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 == 2);
+ frame_server->setEnabled(btn == option_server);
}
#include "kexiprjtypeselector.moc"
diff --git a/kexi/widget/kexiprjtypeselector.h b/kexi/widget/kexiprjtypeselector.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 = 0);
+ explicit KexiPrjTypeSelector(QWidget* parent = 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/kexiprjtypeselector.ui
index bdf472e..f59d755 100644
--- a/kexi/widget/kexiprjtypeselector.ui
+++ b/kexi/widget/kexiprjtypeselector.ui
@@ -1,147 +1,99 @@
-<ui version="4.0" stdsetdef="1" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>KexiPrjTypeSelector</class>
- <widget class="QWidget" name="KexiPrjTypeSelector" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>254</width>
- <height>61</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <item>
- <widget class="Q3ButtonGroup" name="buttonGroup" >
- <property name="frameShape" >
- <enum>Q3GroupBox::NoFrame</enum>
- </property>
- <property name="frameShadow" >
- <enum>Q3GroupBox::Plain</enum>
- </property>
- <property name="lineWidth" >
- <number>0</number>
- </property>
- <property name="title" >
- <string/>
- </property>
- <property name="selectedId" stdset="0" >
- <number>1</number>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <item row="1" column="1" >
- <widget class="QRadioButton" name="option_server" >
- <property name="text" >
- <string>Projects stored on a database server</string>
- </property>
- <property name="buttonGroupId" >
- <number>2</number>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="QRadioButton" name="option_file" >
- <property name="text" >
- <string>Projects stored in a file</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- <property name="buttonGroupId" >
- <number>1</number>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="icon_file" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- <property name="alignment" >
- <set>Qt::AlignVCenter|Qt::AlignLeft</set>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="icon_server" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string/>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- <property name="alignment" >
- <set>Qt::AlignVCenter|Qt::AlignLeft</set>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="Q3Frame" name="frame_server" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape" >
- <enum>NoFrame</enum>
- </property>
- <property name="frameShadow" >
- <enum>Plain</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <tabstops>
- <tabstop>option_file</tabstop>
- <tabstop>option_server</tabstop>
- </tabstops>
- <connections>
- <connection>
- <sender>buttonGroup</sender>
- <signal>clicked(int)</signal>
- <receiver>KexiPrjTypeSelectorBase</receiver>
- <slot>slotSelectionChanged(int)</slot>
- </connection>
- </connections>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>KexiPrjTypeSelector</class>
+ <widget class="QWidget" name="KexiPrjTypeSelector">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>259</width>
+ <height>68</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="icon_file">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="option_file">
+ <property name="text">
+ <string>Projects stored in a file</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="icon_server">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QRadioButton" name="option_server">
+ <property name="text">
+ <string>Projects stored on a database server</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QFrame" name="frame_server">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+ <buttongroups>
+ <buttongroup name="buttonGroup"/>
+ </buttongroups>
</ui>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic