Revision: 7098
Author: nogu.dev
Date: Wed May 18 04:38:37 2011
Log: * qt4/pref/keyeditformbase.cpp
* qt4/pref/keyeditformbase.h
* qt4/pref/olisteditformbase.cpp
* qt4/pref/olisteditformbase.h
- New.
* qt4/pref/keyeditformbase.ui
* qt4/pref/olisteditformbase.ui
- Remove.
* po/POTFILES.in
- Remove keyeditformbase.ui and olisteditformbase.ui.
Add keyeditformbase.h, keyeditformbase.cpp,
olisteditformbase.h, and olisteditformbase.cpp.
* qt4/pref/Makefile.am
- (EXTRA_DIST): Ditto.
* qt4/pref/customwidgets.cpp
- Replace Ui_OListEditFormBase with OListEditFormBase.
- Replace Ui_KeyEditFormBase with KeyEditFormBase.
* qt4/pref/customwidgets.h
- Ditto.
* qt4/pref/uim-pref-qt4.pro.in
- (HEADERS): Add keyeditformbase.h and olisteditformbase.h.
- (FORMS): Remove.
- (SOURCES): Add keyeditformbase.cpp and olisteditformbase.cpp.
http://code.google.com/p/uim/source/detail?r=7098
Added:
/trunk/qt4/pref/keyeditformbase.cpp
/trunk/qt4/pref/keyeditformbase.h
/trunk/qt4/pref/olisteditformbase.cpp
/trunk/qt4/pref/olisteditformbase.h
Deleted:
/trunk/qt4/pref/keyeditformbase.ui
/trunk/qt4/pref/olisteditformbase.ui
Modified:
/trunk/po/POTFILES.in
/trunk/qt4/pref/Makefile.am
/trunk/qt4/pref/customwidgets.cpp
/trunk/qt4/pref/customwidgets.h
/trunk/qt4/pref/uim-pref-qt4.pro.in
=======================================
--- /dev/null
+++ /trunk/qt4/pref/keyeditformbase.cpp Wed May 18 04:38:37 2011
@@ -0,0 +1,88 @@
+/*
+
+ Copyright (c) 2011 uim Project http://code.google.com/p/uim/
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of authors nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+*/
+#include "keyeditformbase.h"
+
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+
+#include "qtgettext.h"
+
+KeyEditFormBase::KeyEditFormBase(QWidget *widget) : QDialog(widget)
+{
+ setWindowTitle(_("Edit Keys"));
+
+ m_listView = new QTreeWidget;
+ QTreeWidgetItem *item = m_listView->headerItem();
+ item->setText(0, _("Key Combination"));
+
+ m_addButton = new QPushButton;
+ m_addButton->setText(_("Add"));
+
+ m_removeButton = new QPushButton;
+ m_removeButton->setText(_("Remove"));
+
+ m_editButton = new QPushButton;
+ m_editButton->setText(_("Edit"));
+
+ QSpacerItem *spacer1 = new QSpacerItem(77, 50, QSizePolicy::Minimum,
QSizePolicy::Expanding);
+
+ QPushButton *m_okButton = new QPushButton;
+ m_okButton->setText(_("OK"));
+ connect(m_okButton, SIGNAL(clicked()), this, SLOT(accept()));
+
+ QPushButton *m_cancelButton = new QPushButton;
+ m_cancelButton->setText(_("Cancel"));
+ connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+
+ QVBoxLayout *vboxLayout = new QVBoxLayout;
+ vboxLayout->addWidget(m_addButton);
+ vboxLayout->addWidget(m_removeButton);
+ vboxLayout->addWidget(m_editButton);
+ vboxLayout->addItem(spacer1);
+ vboxLayout->addWidget(m_okButton);
+ vboxLayout->addWidget(m_cancelButton);
+
+ QHBoxLayout *hboxLayout = new QHBoxLayout;
+ hboxLayout->addWidget(m_listView);
+ hboxLayout->addLayout(vboxLayout);
+
+ QGridLayout *gridLayout = new QGridLayout;
+ gridLayout->addLayout(hboxLayout, 0, 0, 1, 1);
+
+ setLayout(gridLayout);
+}
=======================================
--- /dev/null
+++ /trunk/qt4/pref/keyeditformbase.h Wed May 18 04:38:37 2011
@@ -0,0 +1,53 @@
+/*
+
+ Copyright (c) 2011 uim Project http://code.google.com/p/uim/
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of authors nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+*/
+#ifndef UIM_QT4_PREF_KEYEDITFORMBASE_H
+#define UIM_QT4_PREF_KEYEDITFORMBASE_H
+
+#include <QtGui/QDialog>
+
+class QPushButton;
+class QTreeWidget;
+
+class KeyEditFormBase : public QDialog
+{
+ public:
+ KeyEditFormBase(QWidget *widget = 0);
+
+ protected:
+ QTreeWidget *m_listView;
+ QPushButton *m_addButton;
+ QPushButton *m_removeButton;
+ QPushButton *m_editButton;
+};
+
+#endif // UIM_QT4_PREF_KEYEDITFORMBASE_H
=======================================
--- /dev/null
+++ /trunk/qt4/pref/olisteditformbase.cpp Wed May 18 04:38:37 2011
@@ -0,0 +1,86 @@
+/*
+
+ Copyright (c) 2011 uim Project http://code.google.com/p/uim/
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of authors nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+*/
+#include "olisteditformbase.h"
+
+#include <QtGui/QGridLayout>
+#include <QtGui/QHBoxLayout>
+#include <QtGui/QHeaderView>
+#include <QtGui/QPushButton>
+#include <QtGui/QSpacerItem>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QVBoxLayout>
+
+#include "qtgettext.h"
+
+OListEditFormBase::OListEditFormBase(QWidget *widget) : QDialog(widget)
+{
+ setWindowTitle(_("Edit Ordered List"));
+
+ m_listView = new QTreeWidget;
+ m_listView->setSelectionMode(QAbstractItemView::SingleSelection);
+
+ QTreeWidgetItem *item = m_listView->headerItem();
+ item->setText(0, _("Available Items"));
+
+ m_upButton = new QPushButton;
+ m_upButton->setText(_("Up"));
+
+ m_downButton = new QPushButton;
+ m_downButton->setText(_("Down"));
+
+ QSpacerItem *spacer2 = new QSpacerItem(20, 140, QSizePolicy::Minimum,
QSizePolicy::Expanding);
+
+ QPushButton *m_okButton = new QPushButton;
+ m_okButton->setText(_("OK"));
+ connect(m_okButton, SIGNAL(clicked()), this, SLOT(accept()));
+
+ QPushButton *m_cancelButton = new QPushButton;
+ m_cancelButton->setText(_("Cancel"));
+ connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
+
+ QVBoxLayout *vboxLayout = new QVBoxLayout;
+ vboxLayout->addWidget(m_upButton);
+ vboxLayout->addWidget(m_downButton);
+ vboxLayout->addItem(spacer2);
+ vboxLayout->addWidget(m_okButton);
+ vboxLayout->addWidget(m_cancelButton);
+
+ QHBoxLayout *hboxLayout = new QHBoxLayout;
+ hboxLayout->addWidget(m_listView);
+ hboxLayout->addLayout(vboxLayout);
+
+ QGridLayout *gridLayout = new QGridLayout;
+ gridLayout->addLayout(hboxLayout, 0, 0, 1, 1);
+
+ setLayout(gridLayout);
+}
=======================================
--- /dev/null
+++ /trunk/qt4/pref/olisteditformbase.h Wed May 18 04:38:37 2011
@@ -0,0 +1,52 @@
+/*
+
+ Copyright (c) 2011 uim Project http://code.google.com/p/uim/
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of authors nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS
IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+*/
+#ifndef UIM_QT4_PREF_OLISTEDITFORMBASE_H
+#define UIM_QT4_PREF_OLISTEDITFORMBASE_H
+
+#include <QtGui/QDialog>
+
+class QTreeWidget;
+class QPushButton;
+
+class OListEditFormBase : public QDialog
+{
+ public:
+ OListEditFormBase(QWidget *widget = 0);
+
+ protected:
+ QTreeWidget *m_listView;
+ QPushButton *m_upButton;
+ QPushButton *m_downButton;
+};
+
+#endif // UIM_QT4_PREF_OLISTEDITFORMBASE_H
=======================================
--- /trunk/qt4/pref/keyeditformbase.ui Sat Aug 7 16:42:12 2010
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0" stdsetdef="1">
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>KeyEditFormBase</class>
- <includes>
- <include location="local">qtgettext.h</include>
- </includes>
- <widget class="QDialog" name="KeyEditFormBase">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>392</width>
- <height>229</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="windowTitle">
- <string>Edit Keys</string>
- </property>
- <layout class="QGridLayout">
- <item row="0" column="0">
- <layout class="QHBoxLayout">
- <item>
- <widget class="QTreeWidget" name="m_listView">
- <column>
- <property name="text">
- <string>Key Combination</string>
- </property>
- <property name="clickable">
- <bool>false</bool>
- </property>
- <property name="resizable">
- <bool>true</bool>
- </property>
- </column>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout">
- <item>
- <widget class="QPushButton" name="m_addButton">
- <property name="text">
- <string>Add</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="m_removeButton">
- <property name="text">
- <string>Remove</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="m_editButton">
- <property name="text">
- <string>Edit</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="spacer1">
- <property name="sizeHint">
- <size>
- <width>77</width>
- <height>50</height>
- </size>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="m_okButton">
- <property name="text">
- <string>OK</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="m_cancelButton">
- <property name="text">
- <string>Cancel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <connections>
- <connection>
- <sender>m_okButton</sender>
- <signal>clicked()</signal>
- <receiver>KeyEditFormBase</receiver>
- <slot>accept()</slot>
- </connection>
- <connection>
- <sender>m_cancelButton</sender>
- <signal>clicked()</signal>
- <receiver>KeyEditFormBase</receiver>
- <slot>reject()</slot>
- </connection>
- </connections>
-</ui>
=======================================
--- /trunk/qt4/pref/olisteditformbase.ui Sat Aug 7 16:42:12 2010
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0" stdsetdef="1">
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <includes>
- <include location="local">qtgettext.h</include>
- </includes>
- <class>OListEditFormBase</class>
- <widget class="QDialog" name="OListEditFormBase">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>380</width>
- <height>200</height>
- </rect>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="windowTitle">
- <string>Edit Ordered List</string>
- </property>
- <layout class="QGridLayout">
- <item row="0" column="0">
- <layout class="QHBoxLayout">
- <item>
- <widget class="QTreeWidget" name="m_listView">
- <property name="selectionMode">
- <enum>QAbstractItemView::SingleSelection</enum>
- </property>
- <column>
- <property name="text">
- <string>Available Items</string>
- </property>
- <property name="clickable">
- <bool>false</bool>
- </property>
- <property name="resizable">
- <bool>true</bool>
- </property>
- </column>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout">
- <item>
- <widget class="QPushButton" name="m_upButton">
- <property name="text">
- <string>Up</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="m_downButton">
- <property name="text">
- <string>Down</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="spacer2">
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>140</height>
- </size>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="m_okButton">
- <property name="text">
- <string>OK</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="m_cancelButton">
- <property name="text">
- <string>Cancel</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <connections>
- <connection>
- <sender>m_okButton</sender>
- <signal>clicked()</signal>
- <receiver>OListEditFormBase</receiver>
- <slot>accept()</slot>
- </connection>
- <connection>
- <sender>m_cancelButton</sender>
- <signal>clicked()</signal>
- <receiver>OListEditFormBase</receiver>
- <slot>reject()</slot>
- </connection>
- </connections>
-</ui>
=======================================
--- /trunk/po/POTFILES.in Fri May 6 05:17:56 2011
+++ /trunk/po/POTFILES.in Wed May 18 04:38:37 2011
@@ -22,8 +22,8 @@
qt/toolbar-common-quimhelpertoolbar.cpp
qt4/pref/customwidgets.cpp
qt4/pref/qt4.cpp
-qt4/pref/ui_keyeditformbase.h
-qt4/pref/ui_olisteditformbase.h
+qt4/pref/keyeditformbase.cpp
+qt4/pref/olisteditformbase.cpp
qt4/switcher/qt4.cpp
qt4/toolbar/common-quimhelpertoolbar.cpp
scm/action.scm
=======================================
--- /trunk/qt4/pref/Makefile.am Sat Mar 26 18:48:08 2011
+++ /trunk/qt4/pref/Makefile.am Wed May 18 04:38:37 2011
@@ -18,5 +18,6 @@
EXTRA_DIST = uim-pref-qt4.pro.in \
customwidgets.h qt4.h \
- keyeditformbase.ui olisteditformbase.ui \
+ keyeditformbase.h keyeditformbase.cpp \
+ olisteditformbase.h olisteditformbase.cpp \
customwidgets.cpp qt4.cpp
=======================================
--- /trunk/qt4/pref/customwidgets.cpp Thu Jan 6 18:09:56 2011
+++ /trunk/qt4/pref/customwidgets.cpp Wed May 18 04:38:37 2011
@@ -40,6 +40,7 @@
#include <QtCore/QPointer>
#include <QtGui/QFileDialog>
#include <QtGui/QLabel>
+#include <QtGui/QPushButton>
#include <QtGui/QTreeWidget>
#include <QtGui/QTreeWidgetItem>
#include <QtGui/QVBoxLayout>
@@ -562,10 +563,8 @@
m_lineEdit->setText( str );
}
-OListEditForm::OListEditForm( QWidget *parent )
- : QDialog( parent )
-{
- setupUi( this );
+OListEditForm::OListEditForm( QWidget *parent ) : OListEditFormBase(
parent )
+{
m_listView->setRootIsDecorated( false );
connect( m_upButton, SIGNAL(clicked()),
this, SLOT(upItem()) );
@@ -787,11 +786,8 @@
delete d;
}
-KeyEditForm::KeyEditForm( QWidget *parent )
- : QDialog( parent )
-{
- setupUi( this );
-
+KeyEditForm::KeyEditForm( QWidget *parent ) : KeyEditFormBase( parent )
+{
m_listView->setRootIsDecorated( false );
m_removeButton->setEnabled( false );
m_editButton->setEnabled( false );
=======================================
--- /trunk/qt4/pref/customwidgets.h Thu Jan 6 18:09:56 2011
+++ /trunk/qt4/pref/customwidgets.h Wed May 18 04:38:37 2011
@@ -44,8 +44,8 @@
#include <QtGui/QLineEdit>
#include <QtGui/QSpinBox>
-#include "ui_olisteditformbase.h"
-#include "ui_keyeditformbase.h"
+#include "keyeditformbase.h"
+#include "olisteditformbase.h"
class QPushButton;
class QListViewItem;
@@ -222,7 +222,7 @@
void customValueChanged();
};
-class OListEditForm : public QDialog, public Ui_OListEditFormBase {
+class OListEditForm : public OListEditFormBase {
Q_OBJECT
public:
@@ -259,7 +259,7 @@
void customValueChanged();
};
-class KeyEditForm : public QDialog, public Ui_KeyEditFormBase {
+class KeyEditForm : public KeyEditFormBase {
Q_OBJECT
public:
=======================================
--- /trunk/qt4/pref/uim-pref-qt4.pro.in Sat Mar 26 18:48:08 2011
+++ /trunk/qt4/pref/uim-pref-qt4.pro.in Wed May 18 04:38:37 2011
@@ -9,9 +9,10 @@
QMAKE_UIC = $$QMAKE_UIC -tr UIC_
# Input
-HEADERS += @srcdir@/customwidgets.h @srcdir@/qt4.h
-FORMS += @srcdir@/keyeditformbase.ui @srcdir@/olisteditformbase.ui
-SOURCES += @srcdir@/customwidgets.cpp @srcdir@/qt4.cpp
+HEADERS += @srcdir@/customwidgets.h @srcdir@/qt4.h \
+ @srcdir@/keyeditformbase.h @srcdir@/olisteditformbase.h
+SOURCES += @srcdir@/customwidgets.cpp @srcdir@/qt4.cpp \
+ @srcdir@/keyeditformbase.cpp @srcdir@/olisteditformbase.cpp
TARGET = uim-pref-qt4
