[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/base/plasma/plasmate
From: Sebastian Kügler <sebas () kde ! org>
Date: 2011-03-13 4:29:47
Message-ID: 20110313042947.DCBDAAC8CD () svn ! kde ! org
[Download RAW message or body]
SVN commit 1224657 by sebas:
Rework of startpage, part II
- Get rid of group boxes
- Use a form layout inside the create new project page
- Make start page more friendly to the eye
- Fix up sizing of the widgets
- Default Plasmoid type is Qt Quick
- Use icons on buttons
M +6 -2 startpage.cpp
M +142 -90 startpage.ui
--- trunk/playground/base/plasma/plasmate/startpage.cpp #1224656:1224657
@@ -78,11 +78,15 @@
ui->authorTextField->setText(userName);
ui->emailTextField->setText(userEmail);
- ui->radioButtonJs->setChecked(cg.readEntry("radioButtonJsChecked", true));
+ ui->radioButtonJs->setChecked(cg.readEntry("radioButtonJsChecked", false));
ui->radioButtonPy->setChecked(cg.readEntry("radioButtonPyChecked", false));
ui->radioButtonRb->setChecked(cg.readEntry("radioButtonRbChecked", false));
- ui->radioButtonDe->setChecked(cg.readEntry("radioButtonDeChecked", false));
+ ui->radioButtonDe->setChecked(cg.readEntry("radioButtonDeChecked", true));
+ ui->cancelNewProjectButton->setIcon(KIcon("dialog-cancel"));
+ ui->newProjectButton->setIcon(KIcon("dialog-ok"));
+ ui->titleWidget->setPixmap(KIcon("plasmagik").pixmap(48, 48), \
KTitleWidget::ImageRight); +
// Enforce the security restriction from package.cpp in the input field
connect(ui->projectName, SIGNAL(textEdited(const QString&)),
this, SLOT(processProjectName(const QString&)));
--- trunk/playground/base/plasma/plasmate/startpage.ui #1224656:1224657
@@ -10,7 +10,22 @@
<height>776</height>
</rect>
</property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="KTitleWidget" name="titleWidget">
+ <property name="text">
+ <string><h1>Plasmate</h1></string>
+ </property>
+ </widget>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>36</number>
+ </property>
+ <property name="leftMargin">
+ <number>10</number>
+ </property>
<item>
<widget class="QLabel" name="welcomeText">
<property name="sizePolicy">
@@ -26,14 +41,13 @@
</size>
</property>
<property name="text">
- <string><h1>Plasmate</h1>
-<h3>Create and Share Plasma Addons</h3>
+ <string><h3>Create and Share Plasma Addons</h3>
<p>
With Plasmate, you can easily create your own Plasma Add-Ons, for example Plasma \
written in Qt Quick, JavaScript, Python or Ruby. Plasmate guides you through the \
process of importing an existing Add-On or creating a new one from scratch, \
implementing your functionality, and exporting ready-to-install Plasma Packages, \
either to your computer, or publishing to the world using the Get How New Stuff \
System. </p></string>
</property>
<property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ <set>Qt::AlignJustify|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -58,21 +72,22 @@
<number>0</number>
</property>
<widget class="QWidget" name="stackedWidgetPageOne">
- <layout class="QVBoxLayout" name="verticalLayout_4">
+ <layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QGroupBox" name="groupBox">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string><h3>Create a new Add-On...</h3></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="KListWidget" name="contentTypes">
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+ <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="title">
- <string>Continue working on...</string>
- </property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="1" column="1">
- <widget class="KListWidget" name="recentProjects">
<property name="palette">
<palette>
<active>
@@ -121,36 +136,15 @@
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QPushButton" name="moreButton">
+ <item>
+ <widget class="QLabel" name="label">
<property name="text">
- <string>More Projects...</string>
+ <string><h3>Continue working on...</h3></string>
</property>
</widget>
</item>
- </layout>
- </widget>
- </item>
<item>
- <widget class="QGroupBox" name="groupBox_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>New project...</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="KListWidget" name="contentTypes">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <widget class="KListWidget" name="recentProjects">
<property name="palette">
<palette>
<active>
@@ -199,28 +193,62 @@
</property>
</widget>
</item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <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="QPushButton" name="moreButton">
+ <property name="text">
+ <string>More Projects...</string>
+ </property>
+ </widget>
+ </item>
</layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string><h3>Import an existing project...</h3></string>
+ </property>
</widget>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
- <string>Import existing project</string>
+ <string>From your computer:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="KUrlRequester" name="importUrl">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="maximumSize">
<size>
- <width>200</width>
+ <width>16777215</width>
<height>16777215</height>
</size>
</property>
@@ -235,47 +263,49 @@
</item>
</layout>
</item>
- </layout>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>From Get How New Stuff</string>
+ </property>
+ </widget>
</item>
- <item>
+ <item row="1" column="1">
<widget class="QPushButton" name="importGHNSButton">
<property name="text">
- <string>Import from Get Hot New Stuff</string>
+ <string>Download Add-Ons</string>
</property>
</widget>
</item>
</layout>
- </widget>
- <widget class="QWidget" name="stackedWidgetPageTwo">
- <layout class="QHBoxLayout" name="horizontalLayout_5">
+ </item>
<item>
- <layout class="QGridLayout" name="gridLayout_9">
- <item row="0" column="0">
- <spacer name="verticalSpacer_3">
+ <spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>40</height>
+ <height>129</height>
</size>
</property>
</spacer>
</item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="stackedWidgetPageTwo">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string><h3>Start a new project...</h3></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QFormLayout" name="formLayout_2">
<item row="1" column="0">
- <widget class="QGroupBox" name="groupBox_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>New project...</string>
- </property>
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0">
<widget class="QLabel" name="labelName">
<property name="text">
<string>Name:</string>
@@ -285,10 +315,10 @@
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="1" column="1">
<widget class="KLineEdit" name="projectName"/>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="authorLabel">
<property name="text">
<string>Author:</string>
@@ -298,10 +328,10 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="2" column="1">
<widget class="KLineEdit" name="authorTextField"/>
</item>
- <item row="2" column="0">
+ <item row="3" column="0">
<widget class="QLabel" name="emailLabel">
<property name="text">
<string>Email:</string>
@@ -311,26 +341,19 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<widget class="KLineEdit" name="emailTextField"/>
</item>
- <item row="3" column="0" colspan="2">
+ <item row="5" column="1">
<widget class="QFrame" name="frame">
<property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
+ <enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QLabel" name="labelLanguage">
- <property name="text">
- <string>Language:</string>
- </property>
- </widget>
- </item>
- <item>
<widget class="QRadioButton" name="radioButtonDe">
<property name="text">
<string>Declarative</string>
@@ -373,9 +396,38 @@
</layout>
</widget>
</item>
- <item row="4" column="0" colspan="2">
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string><b>Language</b></string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string><b>Metainfo</b></string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
+ <spacer name="horizontalSpacer_2">
+ <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="KPushButton" name="cancelNewProjectButton">
<property name="text">
<string>Cancel</string>
@@ -397,29 +449,26 @@
</item>
</layout>
</item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0">
- <spacer name="verticalSpacer_4">
+ <item>
+ <spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>40</height>
+ <height>316</height>
</size>
</property>
</spacer>
</item>
</layout>
- </item>
- </layout>
</widget>
</widget>
</item>
</layout>
+ </item>
+ </layout>
</widget>
<customwidgets>
<customwidget>
@@ -433,6 +482,11 @@
<header>klistwidget.h</header>
</customwidget>
<customwidget>
+ <class>KTitleWidget</class>
+ <extends>QWidget</extends>
+ <header>ktitlewidget.h</header>
+ </customwidget>
+ <customwidget>
<class>KPushButton</class>
<extends>QPushButton</extends>
<header>kpushbutton.h</header>
@@ -452,9 +506,7 @@
<tabstop>radioButtonRb</tabstop>
<tabstop>newProjectButton</tabstop>
<tabstop>cancelNewProjectButton</tabstop>
- <tabstop>recentProjects</tabstop>
<tabstop>importUrl</tabstop>
- <tabstop>contentTypes</tabstop>
</tabstops>
<resources/>
<connections>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic