[Uml-devel] branches/work/soc-umbrello
Gopala Krishna A
krishna.ggk at gmail.com
Sun Jul 13 09:11:05 UTC 2008
SVN commit 831747 by gopala:
Merged revisions 831259,831321,831326,831329 via svnmerge from
svn+ssh://svn.kde.org/home/kde/trunk/KDE/kdesdk/umbrello
........
r831259 | fischer | 2008-07-12 15:41:35 +0530 (Sat, 12 Jul 2008) | 1 line
SVN_SILENT: removing tabs.
........
r831321 | fischer | 2008-07-12 18:42:01 +0530 (Sat, 12 Jul 2008) | 1 line
Adding icon for code gen wizard.
........
r831326 | fischer | 2008-07-12 18:46:31 +0530 (Sat, 12 Jul 2008) | 1 line
Small ui improvements and fixes.
........
r831329 | fischer | 2008-07-12 18:49:02 +0530 (Sat, 12 Jul 2008) | 1 line
Moving some png's to directory pics.
........
_M . (directory)
M +12 -12 CODING-STYLE
M +4 -5 umbrello/codegenwizard/codegenerationwizard.cpp
M +3 -0 umbrello/codegenwizard/codegenoptionspage.cpp
M +3 -0 umbrello/codegenwizard/codegenselectpage.cpp
M +0 -11 umbrello/codegenwizard/codegenselectpage.ui
M +3 -0 umbrello/codegenwizard/codegenstatuspage.cpp
M +20 -45 umbrello/codegenwizard/codegenstatuspage.ui
D umbrello/hi128-app-umbrello.png
D umbrello/hi16-app-umbrello.png
D umbrello/hi16-mime-umbrellofile.png
D umbrello/hi22-app-umbrello.png
D umbrello/hi32-app-umbrello.png
D umbrello/hi32-mime-umbrellofile.png
D umbrello/hi48-app-umbrello.png
D umbrello/hi64-app-umbrello.png
M +2 -0 umbrello/icon_utils.cpp
M +4 -3 umbrello/icon_utils.h
M +1 -0 umbrello/pics/CMakeLists.txt
A umbrello/pics/hi128-app-umbrello.png trunk/KDE/kdesdk/umbrello/umbrello/pics/hi128-app-umbrello.png#831329
A umbrello/pics/hi16-app-umbrello.png trunk/KDE/kdesdk/umbrello/umbrello/pics/hi16-app-umbrello.png#831329
A umbrello/pics/hi16-mime-umbrellofile.png trunk/KDE/kdesdk/umbrello/umbrello/pics/hi16-mime-umbrellofile.png#831329
A umbrello/pics/hi22-app-umbrello.png trunk/KDE/kdesdk/umbrello/umbrello/pics/hi22-app-umbrello.png#831329
A umbrello/pics/hi32-app-umbrello.png trunk/KDE/kdesdk/umbrello/umbrello/pics/hi32-app-umbrello.png#831329
A umbrello/pics/hi32-mime-umbrellofile.png trunk/KDE/kdesdk/umbrello/umbrello/pics/hi32-mime-umbrellofile.png#831329
A umbrello/pics/hi48-app-umbrello.png trunk/KDE/kdesdk/umbrello/umbrello/pics/hi48-app-umbrello.png#831329
A umbrello/pics/hi64-app-umbrello.png trunk/KDE/kdesdk/umbrello/umbrello/pics/hi64-app-umbrello.png#831329
** branches/work/soc-umbrello #property svnmerge-integrated
- /trunk/KDE/kdesdk/umbrello:1-814855,815154,815433,815906,815954,816854,816861,817524,817552,819993,820008,821827,823169,823983,824915,825421,828311,828369,828633,828663,828672,829236,829488,829667,829787,829794,829805,831217
+ /trunk/KDE/kdesdk/umbrello:1-814855,815154,815433,815906,815954,816854,816861,817524,817552,819993,820008,821827,823169,823983,824915,825421,828311,828369,828633,828663,828672,829236,829488,829667,829787,829794,829805,831217,831259-831329
--- branches/work/soc-umbrello/CODING-STYLE #831746:831747
@@ -43,8 +43,8 @@
7.) Usage of whitespaces between an opening and closing parenthesis
(e.g. if- and for-statments, function calls) is up to the developer.
Example:
- if (i < 5) <-> if ( i < 5 )
- calculateSalary(age, years); <-> calculateSalary( age, years );
+ if (i < 5) <-> if ( i < 5 )
+ calculateSalary(age, years); <-> calculateSalary( age, years );
8.) For pointers or references, use
either a single space after '*' or '&', but not before (C++ style),
Example:
@@ -151,24 +151,24 @@
32.) Do not add a path to the include statement.
Example:
#include "../uml.h" // wrong
- #include "uml.h" // correct
+ #include "uml.h" // correct
Rationale:
Paths are set in the make files. Rearranging or moving files
should not be followed by source code editing.
33.) Header includes should be listed in the following order and grouped:
- own header
- - Umbrello includes
- - KDE includes
- - Qt includes
+ - Umbrello includes
+ - KDE includes
+ - Qt includes
34.) The headers inside each group should be sorted.
Rationale:
- For ease of locating them.
+ For ease of locating them.
Tip:
Kate/KDevelop users can sort the headers automatically.
- Select the lines you want to sort, then
- Tools -> Filter Selection Through Command -> "sort".
+ Select the lines you want to sort, then
+ Tools -> Filter Selection Through Command -> "sort".
In vim the same can be achieved by marking the block, and then
- doing ":sort".
+ doing ":sort".
In emacs, you can mark the block and then do "M-x sort-lines".
35.) Includes in a header file should be kept to the absolute minimum, as
to keep compile times low. This can be achieved by using forward
@@ -181,12 +181,12 @@
36.) Include macro characters are all in uppercase letters.
Example:
#ifndef MyFileName_h // wrong
- #ifndef MY_FILE_NAME_H // correct
+ #ifndef MY_FILE_NAME_H // correct
37.) Do not use leading or trailing underscores on the include guard macro
as they are reserved for compiler/libc use (checked by Krazy [6]?).
Example:
#ifndef _MY_FILE_NAME_H_ // wrong
- #ifndef MY_FILE_NAME_H // correct
+ #ifndef MY_FILE_NAME_H // correct
Doxygen comments:
--- branches/work/soc-umbrello/umbrello/codegenwizard/codegenerationwizard.cpp #831746:831747
@@ -27,6 +27,7 @@
#include "codegenstatuspage.h"
#include "classifier.h"
#include "uml.h"
+#include "icon_utils.h"
const QSize CodeGenerationWizard::c_pageSize = QSize(520, 530);
@@ -39,9 +40,10 @@
CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList)
: QWizard((QWidget*)UMLApp::app())
{
- setWizardStyle(QWizard::ModernStyle); //:TODO: does not work for MAC
+ setWizardStyle(QWizard::ModernStyle);
+ setPixmap(QWizard::LogoPixmap, Icon_Utils::UserIcon(Icon_Utils::it_Code_Gen_Wizard));
setWindowTitle(i18n("Code Generation Wizard"));
- setPixmap(QWizard::LogoPixmap, QPixmap("../hi48-app-umbrello.png")); //:TODO: does not work ?
+ setOption(QWizard::NoBackButtonOnStartPage, true);
setPage(SelectionPage, createSelectionPage(classList));
setPage(OptionsPage, createOptionsPage());
@@ -64,7 +66,6 @@
{
m_CodeGenSelectPage = new CodeGenSelectPage(this);
m_CodeGenSelectPage->setClassifierList(classList);
- m_CodeGenSelectPage->setTitle(i18n("Select Classes"));
m_CodeGenSelectPage->setFixedSize(c_pageSize);
return m_CodeGenSelectPage;
}
@@ -77,7 +78,6 @@
QWizardPage* CodeGenerationWizard::createOptionsPage()
{
m_CodeGenOptionsPage = new CodeGenOptionsPage(this);
- m_CodeGenOptionsPage->setTitle(i18n("Code Generation Options"));
m_CodeGenOptionsPage->setFixedSize(c_pageSize);
return m_CodeGenOptionsPage;
}
@@ -90,7 +90,6 @@
QWizardPage* CodeGenerationWizard::createStatusPage()
{
m_CodeGenStatusPage = new CodeGenStatusPage(this);
- m_CodeGenStatusPage->setTitle(i18n("Status of Code Generation Progress"));
m_CodeGenStatusPage->setFixedSize(c_pageSize);
return m_CodeGenStatusPage;
}
--- branches/work/soc-umbrello/umbrello/codegenwizard/codegenoptionspage.cpp #831746:831747
@@ -39,6 +39,9 @@
CodeGenOptionsPage::CodeGenOptionsPage(QWidget *parent)
: QWizardPage(parent)
{
+ setTitle(i18n("Code Generation Options"));
+ setSubTitle(i18n("Adjust code generation options."));
+
setupUi(this);
m_pCodePolicyPage = 0;
--- branches/work/soc-umbrello/umbrello/codegenwizard/codegenselectpage.cpp #831746:831747
@@ -33,6 +33,9 @@
CodeGenSelectPage::CodeGenSelectPage(QWidget *parent)
: QWizardPage(parent)
{
+ setTitle(i18n("Select Classes"));
+ setSubTitle(i18n("Place all the classes you want to generate code\nfor in the right hand side list."));
+
setupUi(this);
connect(ui_addButton, SIGNAL(clicked()), this, SLOT(selectClass()));
--- branches/work/soc-umbrello/umbrello/codegenwizard/codegenselectpage.ui #831746:831747
@@ -20,17 +20,6 @@
</property>
<layout class="QVBoxLayout" >
<item>
- <widget class="QLabel" name="ui_labelTitle" >
- <property name="text" >
- <string>Place all the classes you want to generate code
-for in the right hand side list</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
<layout class="QHBoxLayout" >
<item>
<layout class="QVBoxLayout" >
--- branches/work/soc-umbrello/umbrello/codegenwizard/codegenstatuspage.cpp #831746:831747
@@ -41,6 +41,9 @@
CodeGenStatusPage::CodeGenStatusPage(QWidget *parent)
: QWizardPage(parent), m_generationDone(false)
{
+ setTitle(i18n("Status of Code Generation Progress"));
+ setSubTitle(i18n("Press the button Generate to start the code generation.\nCheck the success state for every class."));
+
setupUi(this);
ui_tableWidgetStatus->setColumnCount(3);
--- branches/work/soc-umbrello/umbrello/codegenwizard/codegenstatuspage.ui #831746:831747
@@ -20,56 +20,31 @@
</property>
<layout class="QVBoxLayout" >
<item>
- <widget class="QLabel" name="ui_labelUsage" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QTableWidget" name="ui_tableWidgetStatus" >
+ <property name="alternatingRowColors" >
+ <bool>true</bool>
</property>
- <property name="text" >
- <string>Press the button Generate to start the code generation</string>
+ <property name="columnCount" >
+ <number>3</number>
</property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
+ <column>
+ <property name="text" >
+ <string>Class</string>
+ </property>
+ </column>
+ <column>
+ <property name="text" >
+ <string>Status</string>
+ </property>
+ </column>
+ <column>
+ <property name="text" >
+ <string/>
+ </property>
+ </column>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="ui_groupBox" >
- <property name="title" >
- <string>Generation Status</string>
- </property>
- <layout class="QVBoxLayout" >
- <item>
- <widget class="QTableWidget" name="ui_tableWidgetStatus" >
- <property name="alternatingRowColors" >
- <bool>true</bool>
- </property>
- <property name="columnCount" >
- <number>3</number>
- </property>
- <column>
- <property name="text" >
- <string>Class</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string>Status</string>
- </property>
- </column>
- <column>
- <property name="text" >
- <string/>
- </property>
- </column>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
<layout class="QHBoxLayout" >
<item>
<widget class="QPushButton" name="ui_pushButtonGenerate" >
--- branches/work/soc-umbrello/umbrello/icon_utils.cpp #831746:831747
@@ -432,6 +432,8 @@
return "distribute-vertical";
case it_Align_HorizontalDistribute:
return "distribute-horizontal";
+ case it_Code_Gen_Wizard:
+ return "hi64-app-umbrello.png";
default:
return QString();
}
--- branches/work/soc-umbrello/umbrello/icon_utils.h #831746:831747
@@ -20,10 +20,10 @@
#ifndef ICON_UTILS_H
#define ICON_UTILS_H
+#include "umlnamespace.h"
+#include <kicon.h>
+#include <QtGui/QCursor>
#include <QtGui/QPixmap>
-#include <QtGui/QCursor>
-#include <kicon.h>
-#include "umlnamespace.h"
/**
* This class is a gateway to KIconLoaderfor for handling all the
@@ -209,6 +209,7 @@
it_Align_HorizontalMiddle,
it_Align_VerticalDistribute,
it_Align_HorizontalDistribute,
+ it_Code_Gen_Wizard,
N_ICONTYPES // must remain last
};
--- branches/work/soc-umbrello/umbrello/pics/CMakeLists.txt #831746:831747
@@ -48,6 +48,7 @@
end_of_life.png cursor-end_of_life.png exception.png
cursor-exception.png cursor-object_node.png
cursor-PrePostCondition.png PrePostCondition.png
+hi64-app-umbrello.png
DESTINATION ${DATA_INSTALL_DIR}/umbrello/pics )
kde4_install_icons( ${ICON_INSTALL_DIR} )
More information about the umbrello-devel
mailing list