[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeaddons/konq-plugins/webarchiver
From: Laurent Montel <montel () kde ! org>
Date: 2006-09-29 8:35:40
Message-ID: 1159518940.389906.7134.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 590042 by mlaurent:
convert to uic4
M +1 -1 CMakeLists.txt
M +0 -1 archivedialog.cpp
M +10 -1 archivedialog.h
M +135 -130 archiveviewbase.ui
--- trunk/KDE/kdeaddons/konq-plugins/webarchiver/CMakeLists.txt #590041:590042
@@ -8,7 +8,7 @@
kde4_automoc(${webarchiverplugin_PART_SRCS})
-kde4_add_ui3_files(webarchiverplugin_PART_SRCS archiveviewbase.ui )
+kde4_add_ui_files(webarchiverplugin_PART_SRCS archiveviewbase.ui )
kde4_add_plugin(webarchiverplugin WITH_PREFIX ${webarchiverplugin_PART_SRCS})
--- trunk/KDE/kdeaddons/konq-plugins/webarchiver/archivedialog.cpp #590041:590042
@@ -23,7 +23,6 @@
//Added by qt3to4:
#include <QTextStream>
#include <khtml_part.h>
-#include "archiveviewbase.h"
#include <kinstance.h>
#include <ktemporaryfile.h>
#include <ktar.h>
--- trunk/KDE/kdeaddons/konq-plugins/webarchiver/archivedialog.h #590041:590042
@@ -32,16 +32,25 @@
//Added by qt3to4:
#include <QTextStream>
#include <QList>
+#include "ui_archiveviewbase.h"
class QWidget;
class KHTMLPart;
-class ArchiveViewBase;
class KUrl;
class KTar;
class QTextStream;
class Q3ListViewItem;
class KTemporaryFile;
+class ArchiveViewBase : public QWidget, public Ui::ArchiveViewBase
+{
+public:
+ ArchiveViewBase( QWidget *parent ) : QWidget( parent ) {
+ setupUi( this );
+ }
+};
+
+
class ArchiveDialog : public KDialog
{
Q_OBJECT
--- trunk/KDE/kdeaddons/konq-plugins/webarchiver/archiveviewbase.ui #590041:590042
@@ -1,138 +1,143 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>ArchiveViewBase</class>
-<widget class="QWidget">
- <property name="name">
- <cstring>ArchiveViewBase</cstring>
+<ui version="4.0" stdsetdef="1" >
+ <author></author>
+ <comment></comment>
+ <exportmacro></exportmacro>
+ <class>ArchiveViewBase</class>
+ <widget class="QWidget" name="ArchiveViewBase" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>600</width>
+ <height>483</height>
+ </rect>
</property>
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>600</width>
- <height>483</height>
- </rect>
+ <property name="windowTitle" >
+ <string>Web Archiver</string>
</property>
- <property name="caption">
- <string>Web Archiver</string>
- </property>
- <vbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout4</cstring>
+ <layout class="QVBoxLayout" >
+ <item>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <item row="1" column="1" >
+ <widget class="QLabel" name="targetLabel" >
+ <property name="textInteractionFlags" >
+ <enum>Qt::LinksAccessibleByMouse</enum>
+ </property>
+ <property name="openExternalLinks" >
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Local File</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="textLabel1_2" >
+ <property name="text" >
+ <string>To:</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="textLabel1" >
+ <property name="text" >
+ <string>Archiving:</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="urlLabel" >
+ <property name="textInteractionFlags" >
+ <enum>Qt::LinksAccessibleByMouse</enum>
+ </property>
+ <property name="openExternalLinks" >
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Original URL</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="Q3ProgressBar" name="progressBar" />
+ </item>
+ <item>
+ <widget class="K3ListView" name="listView" >
+ <property name="resizeMode" >
+ <enum>AllColumns</enum>
+ </property>
+ <property name="fullWidth" >
+ <bool>true</bool>
+ </property>
+ <column>
+ <property name="text" >
+ <string>URL</string>
</property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel" row="1" column="1">
- <property name="name">
- <cstring>targetLabel</cstring>
- </property>
- <property name="textInteractionFlags">
- <enum>Qt::LinksAccessibleByMouse</enum>
- </property>
- <property name="openExternalLinks">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Local File</string>
- </property>
- </widget>
- <widget class="QLabel" row="1" column="0">
- <property name="name">
- <cstring>textLabel1_2</cstring>
- </property>
- <property name="text">
- <string>To:</string>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="0">
- <property name="name">
- <cstring>textLabel1</cstring>
- </property>
- <property name="text">
- <string>Archiving:</string>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="1">
- <property name="name">
- <cstring>urlLabel</cstring>
- </property>
- <property name="textInteractionFlags">
- <enum>Qt::LinksAccessibleByMouse</enum>
- </property>
- <property name="openExternalLinks">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>1</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Original URL</string>
- </property>
- </widget>
- </grid>
- </widget>
- <widget class="QProgressBar">
- <property name="name">
- <cstring>progressBar</cstring>
+ <property name="clickable" >
+ <bool>true</bool>
</property>
- </widget>
- <widget class="K3ListView">
- <column>
- <property name="text">
- <string>URL</string>
- </property>
- <property name="clickable">
- <bool>true</bool>
- </property>
- <property name="resizable">
- <bool>true</bool>
- </property>
- </column>
- <column>
- <property name="text">
- <string>State</string>
- </property>
- <property name="clickable">
- <bool>true</bool>
- </property>
- <property name="resizable">
- <bool>true</bool>
- </property>
- </column>
- <property name="name">
- <cstring>listView</cstring>
+ <property name="resizable" >
+ <bool>true</bool>
</property>
- <property name="resizeMode">
- <enum>AllColumns</enum>
+ </column>
+ <column>
+ <property name="text" >
+ <string>State</string>
</property>
- <property name="fullWidth">
- <bool>true</bool>
+ <property name="clickable" >
+ <bool>true</bool>
</property>
+ <property name="resizable" >
+ <bool>true</bool>
+ </property>
+ </column>
</widget>
- </vbox>
-</widget>
-<customwidgets>
-</customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
- <includehint>k3listview.h</includehint>
-</includehints>
-</UI>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>K3ListView</class>
+ <extends>Q3ListView</extends>
+ <header>k3listview.h</header>
+ </customwidget>
+ </customwidgets>
+ <includes>
+ <include location="local" >k3listview.h</include>
+ </includes>
+</ui>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic