[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-panel-devel
Subject: [Panel-devel] plasmagik patch
From: Andrea Diamantini <adjam7 () gmail ! com>
Date: 2007-09-18 23:26:17
Message-ID: 200709190126.17267.adjam7 () gmail ! com
[Download RAW message or body]
Here it is. Hope is good.
See you.
adjam7
["diff.patch" (text/x-diff)]
Index: description.ui
===================================================================
--- description.ui (revisione 710427)
+++ description.ui (copia locale)
@@ -5,57 +5,44 @@
<rect>
<x>0</x>
<y>0</y>
- <width>648</width>
- <height>393</height>
+ <width>276</width>
+ <height>278</height>
</rect>
</property>
+ <property name="windowTitle" >
+ <string>Input Description</string>
+ </property>
<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="QLabel" name="creationDescriptionLabel" >
- <property name="text" >
- <string>A short description:</string>
- </property>
- </widget>
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="QLabel" name="creationDescriptionLabel" >
+ <property name="text" >
+ <string>A short description:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="creationDescription" />
+ </item>
+ </layout>
</item>
<item>
- <widget class="KLineEdit" name="creationDescription" />
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="QLabel" name="releaseNotesLabel" >
+ <property name="text" >
+ <string>Releast Notes (optional):</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QTextEdit" name="creationNotes" />
+ </item>
+ </layout>
</item>
- <item>
- <widget class="QLabel" name="releaseNotesLabel" >
- <property name="text" >
- <string>Releast Notes:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KTextEdit" name="creationNotes" />
- </item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
- <class>KTextEdit</class>
- <extends>QTextEdit</extends>
- <header>ktextedit.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
Index: welcomepage.ui
===================================================================
--- welcomepage.ui (revisione 710427)
+++ welcomepage.ui (copia locale)
@@ -5,20 +5,14 @@
<rect>
<x>0</x>
<y>0</y>
- <width>534</width>
- <height>235</height>
+ <width>316</width>
+ <height>168</height>
</rect>
</property>
- <layout class="QVBoxLayout" >
- <property name="leftMargin" >
- <number>0</number>
- </property>
- <property name="rightMargin" >
- <number>0</number>
- </property>
- <property name="bottomMargin" >
- <number>0</number>
- </property>
+ <property name="windowTitle" >
+ <string>Welcome, folk!</string>
+ </property>
+ <layout class="QHBoxLayout" >
<item>
<widget class="QLabel" name="firstLabel" >
<property name="text" >
Index: TODO
===================================================================
--- TODO (revisione 710427)
+++ TODO (copia locale)
@@ -9,3 +9,28 @@
Need to be able to add individual files based on a PackageStructure
Divide the required and optional fields on the metadata page into two pieces
Display something in the KTitleWidget in the KAssistantDialog with setHeader (and \
setIcon?) calls on the KPageWidgetItem objects +
+
+ANDREA
+========
+
+# (OK) 1. apidox comments on variables in wizmagik.h
+# (OK) 2. porting to kde4
+
+3. wizmagik.cpp:
+ setApplication && setType
+
+4. test plasma::createpackage
+
+5. plasma API createpackage overloading proposal
+
+# (OK) 6. metadata.ui: sistemare License && RequiredVersion
+
+7. Internationalization (stringhe con tr("...") )
+
+IMPORTANTE
+==============
+le uniche cose che davvero mancano sono:
+A. non funziona Plasma::createPackage
+B. da creare la funzione uploadPackage
+C. campi License e Required Version in metadata.ui --- OK!
\ Nessun a-capo alla fine del file
Index: createpackage.ui
===================================================================
--- createpackage.ui (revisione 710427)
+++ createpackage.ui (copia locale)
@@ -5,105 +5,111 @@
<rect>
<x>0</x>
<y>0</y>
- <width>595</width>
- <height>300</height>
+ <width>334</width>
+ <height>377</height>
</rect>
</property>
+ <property name="windowTitle" >
+ <string>Create Package</string>
+ </property>
<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="QLabel" name="label_8" >
- <property name="text" >
- <string><html><head><meta name="qrichtext" content="1" /><style \
type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; \
font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; \
font-style:italic;">NOTE</span><span style=" font-style:italic;"> that the \
</span><span style=" font-weight:600; font-style:italic;">whole \
directory</span><span style=" font-style:italic;"> will be \
packaged!</span><br />Please select the folder containing the content you want \
to <br />have packaged:</p></body></html></string>
- </property>
- </widget>
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="QLabel" name="lblAddFile" >
+ <property name="text" >
+ <string>Choose files you want to add to your package..</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QPushButton" name="btAddFile" >
+ <property name="text" >
+ <string>&Add File..</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QListWidget" name="lsAddFile" />
+ </item>
+ </layout>
</item>
<item>
- <widget class="KUrlRequester" name="sourcePathRequester" />
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="QLabel" name="lbLocationPath" >
+ <property name="text" >
+ <string>Choose the directory where you want to create the package..</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QPushButton" name="btLocationPath" >
+ <property name="text" >
+ <string>&Location Path..</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lnLocationPath" />
+ </item>
+ </layout>
</item>
<item>
- <widget class="QLabel" name="firstFileLabel" >
- <property name="toolTip" >
- <string><html><head><meta name="qrichtext" content="1" /><style \
type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; \
font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">The file you should select as "main file" \
differs a lot depending on what is the type of package you're making. \
</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">Here are a few exaples provided for helping you \
choose the right file.</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">The file to be selected should already have \
been told from the application (see manual, etc...), if not, please complain to the \
application maintainer.</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;">Here are the examples:</p>
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; \
margin-left:0px; margin-right:0px; -qt-block-indent:0; \
text-indent:0px;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px;"> <span style=" font-weight:600;">* \
Wallpaper:</span> A wallpaper should probably select the image to be loaded for \
the wallpaper here.</p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; \
-qt-block-indent:0; text-indent:0px; font-weight:600;">* Script:<span style=" \
font-weight:400;"> In case your creation is a script, you should select the main \
file, that includes each other, the one the application should directly \
use.</span></p></body></html></string>
- </property>
- <property name="text" >
- <string>Select the main file of your creation:</string>
- </property>
- </widget>
+ <layout class="QHBoxLayout" >
+ <item>
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>Create the package with files you choose by clicking here.
+ Check the box if you want to upload it, too.</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="ckUpload" >
+ <property name="text" >
+ <string>&Upload</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item>
- <widget class="KUrlRequester" name="firstFile" />
- </item>
- <item>
- <widget class="QLabel" name="label_11" >
- <property name="text" >
- <string>Choose where you want the package created:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KUrlRequester" name="destFile" />
- </item>
- <item>
- <widget class="QPushButton" name="packageButton" >
- <property name="text" >
- <string>Create Package!</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="label_12" >
- <property name="text" >
- <string>If you don't want to upload the package, you can exit now by
-pressing on the "Finish" button</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>KUrlRequester</class>
- <extends>QFrame</extends>
- <header>kurlrequester.h</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections/>
</ui>
Index: metadata.ui
===================================================================
--- metadata.ui (revisione 710427)
+++ metadata.ui (copia locale)
@@ -5,23 +5,14 @@
<rect>
<x>0</x>
<y>0</y>
- <width>611</width>
- <height>414</height>
+ <width>303</width>
+ <height>267</height>
</rect>
</property>
+ <property name="windowTitle" >
+ <string>Insert your data here</string>
+ </property>
<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="QGroupBox" name="groupBox_6" >
<property name="sizePolicy" >
@@ -45,7 +36,7 @@
</widget>
</item>
<item row="0" column="1" >
- <widget class="KLineEdit" name="creationName" />
+ <widget class="QLineEdit" name="creationName" />
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_6" >
@@ -58,7 +49,7 @@
</widget>
</item>
<item row="1" column="1" >
- <widget class="KLineEdit" name="creationAuthor" />
+ <widget class="QLineEdit" name="creationAuthor" />
</item>
<item row="2" column="0" >
<widget class="QLabel" name="creationVersionLabel" >
@@ -71,7 +62,7 @@
</widget>
</item>
<item row="2" column="1" >
- <widget class="KRestrictedLine" name="creationVersion" />
+ <widget class="QLineEdit" name="creationVersion" />
</item>
<item row="3" column="0" >
<widget class="QLabel" name="label_10" >
@@ -84,85 +75,16 @@
</widget>
</item>
<item row="3" column="1" >
- <widget class="QComboBox" name="creationLicense" >
- <item>
- <property name="text" >
- <string/>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>GPL</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>LGPL</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>BSD</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>MPL</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Creative Commons 3.0 BY</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Creative Commons 3.0 BY-SA</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Creative Commons 3.0 BY-ND</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Creative Commons 3.0 BY-ND-NC</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Creative Commons 3.0 BY-NC-SA</string>
- </property>
- </item>
- <item>
- <property name="text" >
- <string>Custom license...</string>
- </property>
- </item>
- </widget>
+ <widget class="QComboBox" name="creationLicense" />
</item>
<item row="4" column="0" >
- <widget class="QLabel" name="label_20" >
- <property name="text" >
- <string>Content type: </string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="4" column="1" >
- <widget class="QComboBox" name="creationLanguage" />
- </item>
- <item row="5" column="0" >
<widget class="QLabel" name="label_21" >
<property name="text" >
<string>Required version: </string>
</property>
</widget>
</item>
- <item row="5" column="1" >
+ <item row="4" column="1" >
<widget class="QComboBox" name="creationRequiredVersion" />
</item>
</layout>
@@ -204,73 +126,19 @@
</widget>
</item>
<item row="1" column="1" >
- <widget class="KLineEdit" name="creationEmail" />
+ <widget class="QLineEdit" name="creationEmail" />
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="label_9" >
- <property name="text" >
- <string>Icon: (PNG or SVG)</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="KUrlRequester" name="creationIcon" />
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="label" >
- <property name="text" >
- <string>Or, choose a system icon:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="KIconButton" name="kiconbutton" />
- </item>
</layout>
</widget>
</item>
- <item>
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<customwidgets>
<customwidget>
- <class>KIconButton</class>
- <extends>QPushButton</extends>
- <header>kicondialog.h</header>
- </customwidget>
- <customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
- <customwidget>
- <class>KRestrictedLine</class>
- <extends>KLineEdit</extends>
- <header>krestrictedline.h</header>
- </customwidget>
- <customwidget>
- <class>KUrlRequester</class>
- <extends>QFrame</extends>
- <header>kurlrequester.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revisione 710427)
+++ CMakeLists.txt (copia locale)
@@ -1,8 +1,12 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} \
${KDE4_INCLUDE_DIR} ${QT_INCLUDES})
set(plasmagik_SRCS
- uploader.cpp
- test.cpp
+ createpackage.cpp
+ description.cpp
+ main.cpp
+ metadata.cpp
+ welcomepage.cpp
+ wizmagik.cpp
)
kde4_add_ui_files(plasmagik_SRCS
_______________________________________________
Panel-devel mailing list
Panel-devel@kde.org
https://mail.kde.org/mailman/listinfo/panel-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic