[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdesdk/kioslave/svn/ksvnd
From: Laurent Montel <montel () kde ! org>
Date: 2008-02-20 7:54:43
Message-ID: 1203494083.408582.21124.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 777252 by mlaurent:
Port to uic4
M +1 -1 CMakeLists.txt
M +80 -108 commitdlg.ui
D commitdlg.ui.h
M +1 -2 ksvnd.cpp
M +18 -0 ksvnd.h
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/CMakeLists.txt #777251:777252
@@ -5,7 +5,7 @@
qt4_add_dbus_adaptor( kded_ksvnd_PART_SRCS org.kde.ksvnd.xml ksvnd.h KSvnd )
-kde4_add_ui3_files(kded_ksvnd_PART_SRCS commitdlg.ui )
+kde4_add_ui_files(kded_ksvnd_PART_SRCS commitdlg.ui )
kde4_add_plugin(kded_ksvnd ${kded_ksvnd_PART_SRCS})
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/commitdlg.ui #777251:777252
@@ -1,116 +1,88 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>CommitDlg</class>
-<widget class="QDialog">
- <property name="name">
- <cstring>CommitDlg</cstring>
+<ui version="4.0" stdsetdef="1" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>CommitDlg</class>
+ <widget class="QDialog" name="CommitDlg" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>451</width>
+ <height>337</height>
+ </rect>
</property>
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>451</width>
- <height>337</height>
- </rect>
+ <property name="windowTitle" >
+ <string>Log Message</string>
</property>
- <property name="windowTitle">
- <string>Log Message</string>
- </property>
- <vbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout2</cstring>
- </property>
- <vbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="KTextEdit">
- <property name="name">
- <cstring>textMessage</cstring>
- </property>
+ <layout class="QVBoxLayout" >
+ <item>
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="KTextEdit" name="textMessage" />
+ </item>
+ <item>
+ <widget class="KTextEdit" name="listMessage" >
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <item>
+ <spacer name="spacer1" >
+ <property name="sizeHint" >
+ <size>
+ <width>220</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton1" >
+ <property name="text" >
+ <string>&OK</string>
+ </property>
</widget>
- <widget class="KTextEdit">
- <property name="name">
- <cstring>listMessage</cstring>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton2" >
+ <property name="text" >
+ <string>&Cancel</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout1</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer>
- <property name="name">
- <cstring>spacer1</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>220</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="QPushButton">
- <property name="name">
- <cstring>pushButton1</cstring>
- </property>
- <property name="text">
- <string>&OK</string>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>pushButton2</cstring>
- </property>
- <property name="text">
- <string>&Cancel</string>
- </property>
- </widget>
- </hbox>
- </widget>
- </vbox>
- </widget>
- </vbox>
-</widget>
-<connections>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <includes>
+ <include location="local" >ktextedit.h</include>
+ </includes>
+ <connections>
<connection>
- <sender>pushButton1</sender>
- <signal>clicked()</signal>
- <receiver>CommitDlg</receiver>
- <slot>accept()</slot>
+ <sender>pushButton1</sender>
+ <signal>clicked()</signal>
+ <receiver>CommitDlg</receiver>
+ <slot>accept()</slot>
</connection>
<connection>
- <sender>pushButton2</sender>
- <signal>clicked()</signal>
- <receiver>CommitDlg</receiver>
- <slot>reject()</slot>
+ <sender>pushButton2</sender>
+ <signal>clicked()</signal>
+ <receiver>CommitDlg</receiver>
+ <slot>reject()</slot>
</connection>
-</connections>
-<includes>
- <include location="local" impldecl="in implementation">commitdlg.ui.h</include>
-</includes>
-<functions>
- <function>setLog( const QString & comment )</function>
- <function returnType="QString">logMessage() const</function>
-</functions>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>ktextedit.h</includehint>
- <includehint>ktextedit.h</includehint>
-</includehints>
-</UI>
+ </connections>
+</ui>
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.cpp #777251:777252
@@ -28,7 +28,6 @@
#include "ksvndadaptor.h"
#include "ksvnd.h"
-#include "commitdlg.h"
#include <kpluginfactory.h>
#include <kpluginloader.h>
@@ -47,7 +46,7 @@
}
QString KSvnd::commitDialog(const QString &modifiedFiles) {
- CommitDlg commitDlg;
+ CommitDlg commitDlg(0);
commitDlg.setLog( modifiedFiles );
int result = commitDlg.exec();
if ( result == QDialog::Accepted ) {
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.h #777251:777252
@@ -26,7 +26,25 @@
#include <kurl.h>
#include <qstringlist.h>
#include <QByteArray>
+#include <ui_commitdlg.h>
+#include <QDialog>
+class CommitDlg : public QDialog, public Ui::CommitDlg
+{
+public:
+ CommitDlg( QWidget *parent ) : QDialog( parent ) {
+ setupUi( this );
+ }
+ void setLog( const QString & comment )
+ {
+ listMessage->setText(comment);
+ }
+ QString logMessage() const
+ {
+ return textMessage->text();
+ }
+};
+
class KSvnd : public KDEDModule
{
Q_OBJECT
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic