[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/base/raptormenu/tomedit
From: Dariusz Mikulski <dariusz.mikulski () gmail ! com>
Date: 2008-03-03 22:41:18
Message-ID: 1204584078.776385.6848.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 781938 by mikulski:
Move strange consts away from main code
M +1 -1 main.cpp
M +72 -42 tomeditorform.cpp
M +2 -1 tomeditorform.h
--- trunk/playground/base/raptormenu/tomedit/main.cpp #781937:781938
@@ -7,7 +7,7 @@
Q_INIT_RESOURCE(tomeditorbuilder);
QApplication app(argc, argv);
- RaptorMenu::TomEditorForm *tomEditorForm = new RaptorMenu::TomEditorForm;
+ RaptorMenu::TomEditorForm *tomEditorForm = new RaptorMenu::TomEditorForm();
tomEditorForm->show();
return app.exec();
--- trunk/playground/base/raptormenu/tomedit/tomeditorform.cpp #781937:781938
@@ -4,37 +4,67 @@
#include "tomeditorform.h"
-const int UI_EDITOR_TAB = 0;
-const int TEXT_VIEW_TAB = 1;
namespace RaptorMenu
{
+
+/// \brief: get away const's from main code
+const int UI_EDITOR_TAB = 0;
+const int TEXT_VIEW_TAB = 1;
+const int WINDOW_WIDTH = 725;
+const int WINDOW_HEIGHT = 570;
+
+const QString UI_MAIN_TEXT_EDIT = "xmlEdit";
+const QString UI_TREE = "tomtree";
+const QString UI_LABEL = "label";
+const QString UI_LABEL_SELECTED = "lblSelected";
+const QString UI_TAB = "tabWidget";
+const QString UI_FIELD_NAME = "fieldName";
+const QString UI_FIELD_PROG = "fieldProg";
+const QString UI_FIELD_DESC = "fieldDesc";
+const QString UI_FIELD_DESC_F = "fieldDeskF";
+const QString UI_OPEN_BUTTON = "btnOpen";
+const QString UI_SAVE_BUTTON = "btnSave";
+const QString UI_APPLY_BUTTON = "btnApply";
+const QString UI_RESET_BUTTON = "btnReset";
+const QString UI_DEL_BUTTON = "btnDel";
+const QString UI_EDIT_BUTTON = "btnEdit";
+const QString UI_ADD_TGBUTTON = "btnAddTG";
+const QString UI_ADD_TABUTTON = "btnAddTA";
+const QString UI_ADD_TIBUTTON = "btnAddTI";
+const QString DEFAULT_XML_PATH = "/usr/share/tom/tom.xml";
+const QString TOM_UI_PATH = ":forms/tom-edit.ui";
+const QString TOM_TASK_GROUP_DESC = "Tom Task Group";
+const QString TOM_TASK_ACTION_DESC = "Tom Task Action";
+const QString TOM_ITEM_DESC = "Tom Item";
+const QString XML_ERROR_DESC = "Error xml";
+
TomEditorForm::TomEditorForm(QWidget *parent)
: QWidget(parent)
{
QWidget *formWidget = loadUiFile();
- ui_mainTextEdit = qFindChild<QTextEdit*>(this, "xmlEdit");
- ui_tree = qFindChild<QTreeWidget*>(this, "tomtree");
- ui_label = qFindChild<QLabel*>(this, "label");
- ui_labelSelected = qFindChild<QLabel*>(this, "lblSelected");
- ui_tab = qFindChild<QTabWidget*>(this, "tabWidget");
+ ui_mainTextEdit = qFindChild<QTextEdit*>(this, RaptorMenu::UI_MAIN_TEXT_EDIT);
+ ui_tree = qFindChild<QTreeWidget*>(this, RaptorMenu::UI_TREE);
+ ui_label = qFindChild<QLabel*>(this, RaptorMenu::UI_LABEL);
+ ui_labelSelected = qFindChild<QLabel*>(this, RaptorMenu::UI_LABEL_SELECTED);
+ ui_tab = qFindChild<QTabWidget*>(this, RaptorMenu::UI_TAB);
- fldName = qFindChild<QLineEdit*>(this, "fieldName");
- fldProg = qFindChild<QLineEdit*>(this, "fieldProg");
- fldDesc = qFindChild<QLineEdit*>(this, "fieldDesc");
- fldDeskF = qFindChild<QLineEdit*>(this, "fieldDeskF");
+ fldName = qFindChild<QLineEdit*>(this, RaptorMenu::UI_FIELD_NAME);
+ fldProg = qFindChild<QLineEdit*>(this, RaptorMenu::UI_FIELD_PROG);
+ fldDesc = qFindChild<QLineEdit*>(this, RaptorMenu::UI_FIELD_DESC);
+ fldDeskF = qFindChild<QLineEdit*>(this, RaptorMenu::UI_FIELD_DESC_F);
- ui_openButton = qFindChild<QPushButton*>(this, "btnOpen");
- ui_saveButton = qFindChild<QPushButton*>(this, "btnSave");
- ui_applyButton = qFindChild<QPushButton*>(this, "btnApply");
- ui_resetButton = qFindChild<QPushButton*>(this, "btnReset");
+ ui_openButton = qFindChild<QPushButton*>(this, RaptorMenu::UI_OPEN_BUTTON);
+ ui_saveButton = qFindChild<QPushButton*>(this, RaptorMenu::UI_SAVE_BUTTON);
+ ui_applyButton = qFindChild<QPushButton*>(this, RaptorMenu::UI_APPLY_BUTTON);
+ ui_resetButton = qFindChild<QPushButton*>(this, RaptorMenu::UI_RESET_BUTTON);
- ui_delButton = qFindChild<QPushButton*>(this, "btnDel");
- ui_editButton = qFindChild<QPushButton*>(this, "btnEdit");
+ ui_delButton = qFindChild<QPushButton*>(this, RaptorMenu::UI_DEL_BUTTON);
+ ui_editButton = qFindChild<QPushButton*>(this, RaptorMenu::UI_EDIT_BUTTON);
- ui_addTGButton = qFindChild<QPushButton*>(this, "btnAddTG");
- ui_addTAButton = qFindChild<QPushButton*>(this, "btnAddTA");
- ui_addTIButton = qFindChild<QPushButton*>(this, "btnAddTI");
+ ui_addTGButton = qFindChild<QPushButton*>(this, RaptorMenu::UI_ADD_TGBUTTON);
+ ui_addTAButton = qFindChild<QPushButton*>(this, RaptorMenu::UI_ADD_TABUTTON);
+ ui_addTIButton = qFindChild<QPushButton*>(this, RaptorMenu::UI_ADD_TIBUTTON);
connect(ui_tree, SIGNAL(itemSelectionChanged()), this, \
SLOT(treeSelectionChanged()));
connect(this, SIGNAL(itemListChanged()), this, SLOT(treeSelectionChanged()));
@@ -52,9 +82,9 @@
QMetaObject::connectSlotsByName(this);
setWindowTitle(tr("TOM Editor"));
- setFixedSize(725, 570);
+ setFixedSize(RaptorMenu::WINDOW_WIDTH, RaptorMenu::WINDOW_HEIGHT);
- loadFile("/usr/share/tom/tom.xml");
+ loadFile(RaptorMenu::DEFAULT_XML_PATH);
ui_tab->setTabEnabled(TEXT_VIEW_TAB, false);
}
@@ -63,7 +93,7 @@
{
QUiLoader loader;
- QFile file(":forms/tom-edit.ui");
+ QFile file(RaptorMenu::TOM_UI_PATH);
file.open(QFile::ReadOnly);
QWidget *formWidget = loader.load(&file, this);
@@ -140,17 +170,17 @@
switch (typeId) {
- case 0: //TOM Selected
+ case TomEditorForm::TOM_SELECTED:
fldDeskF->setText("......");
break;
- case 1: //TaskGrp Selected
+ case TomEditorForm::TASK_GRP_SELECTED:
fldDeskF->setText("......");
//Enable Buttons
ui_addTAButton->setEnabled(true);
break;
- case 2: //TaskAct Selected
+ case TomEditorForm::TASK_ACT_SELECTED:
fldDeskF->setText("......");
//Enable Buttons
ui_addTIButton->setEnabled(true);
@@ -158,7 +188,7 @@
ui_addTAButton->setEnabled(false);
break;
- case 3: //TaskItm Selected
+ case TomEditorForm::TASK_ITEM_SELECTED:
//Disable Buttons
ui_addTIButton->setEnabled(false);
ui_addTAButton->setEnabled(false);
@@ -223,7 +253,7 @@
QTreeWidgetItem *tomtg_listItem = new QTreeWidgetItem(ui_tree); // Create \
the first node. TomTaskGroup tomTaskGroup = tglist.at(a);
tomtg_listItem->setText(0, tomTaskGroup.getName());
- tomtg_listItem->setText(1, "Tom Task Group");
+ tomtg_listItem->setText(1, RaptorMenu::TOM_TASK_GROUP_DESC);
tomtg_listItem->setText(2, QString("%1").arg(tomTaskGroup.ID));
tomtg_listItem->setText(3, QString("%1").arg(1));
@@ -235,7 +265,7 @@
QTreeWidgetItem *tomta_listItem = new QTreeWidgetItem(tomtg_listItem); \
// Create the first node. TomTaskAction tomTaskAction = talist.at(b);
tomta_listItem->setText(0, tomTaskAction.getName());
- tomta_listItem->setText(1, "Tom Task Action");
+ tomta_listItem->setText(1, RaptorMenu::TOM_TASK_ACTION_DESC);
tomta_listItem->setText(2, QString("%1").arg(tomTaskAction.ID));
tomta_listItem->setText(3, QString("%1").arg(2));
@@ -247,7 +277,7 @@
QTreeWidgetItem *tomitem_listItem = new \
QTreeWidgetItem(tomta_listItem); // Create the first node. TomItem tomItem = \
itmlist.at(c); tomitem_listItem->setText(0, tomItem.getDeskFilePath());
- tomitem_listItem->setText(1, "Tom Item");
+ tomitem_listItem->setText(1, RaptorMenu::TOM_ITEM_DESC);
tomitem_listItem->setText(2, QString("%1").arg(tomItem.ID));
tomitem_listItem->setText(3, QString("%1").arg(3));
@@ -272,18 +302,18 @@
switch (typeId) {
- case 0: //TOM Selected
+ case TomEditorForm::TOM_SELECTED:
break;
- case 1: //TaskGrp Selected
+ case TomEditorForm::TASK_GRP_SELECTED:
found = manXml.findTomtaskGrpChild(ptr_tomGroup, \
(currenti->text(2)).toLong(), DEL); break;
- case 2: //TaskAct Selected
+ case TomEditorForm::TASK_ACT_SELECTED:
found = manXml.findTomtaskActionChild(ptr_tomGroup, \
(currenti->text(2)).toLong(), DEL); break;
- case 3: //TaskItm Selected
+ case TomEditorForm::TASK_ITEM_SELECTED:
found = manXml.findTomitemChild(ptr_tomGroup, (currenti->text(2)).toLong(), \
DEL); break;
}
@@ -308,10 +338,10 @@
switch (typeId) {
- case 0: //TOM Selected
+ case TomEditorForm::TOM_SELECTED:
break;
- case 1: //TaskGrp Selected
+ case TomEditorForm::TASK_GRP_SELECTED:
found = manXml.findTomtaskGrpChild(ptr_tomGroup, \
(currenti->text(2)).toLong(), FIND); if (found) {
TomTaskAction tAction;
@@ -328,7 +358,7 @@
}
break;
- case 2: //TaskAct Selected
+ case TomEditorForm::TASK_ACT_SELECTED:
found = manXml.findTomtaskActionChild(ptr_tomGroup, \
(currenti->text(2)).toLong(), FIND); if (found) {
TomItem tItem;
@@ -374,10 +404,10 @@
int found = 0;
switch (typeId) {
- case 0: //TOM Selected
+ case TomEditorForm::TOM_SELECTED:
break;
- case 1: //TaskGrp Selected
+ case TomEditorForm::TASK_GRP_SELECTED:
found = manXml.findTomtaskGrpChild(ptr_tomGroup, \
(currenti->text(2)).toLong(), FIND); if (found) {
bool ok;
@@ -391,7 +421,7 @@
}
break;
- case 2: //TaskAct Selected
+ case TomEditorForm::TASK_ACT_SELECTED:
found = manXml.findTomtaskActionChild(ptr_tomGroup, \
(currenti->text(2)).toLong(), FIND); if (found) {
bool ok;
@@ -405,7 +435,7 @@
}
break;
- case 3: //TomItem Selected
+ case TomEditorForm::TASK_ITEM_SELECTED:
found = manXml.findTomitemChild(ptr_tomGroup, (currenti->text(2)).toLong(), \
FIND); if (found) {
QString fileName;
@@ -432,7 +462,7 @@
updateTextView();
generateItemTree();
} else {
- QMessageBox::critical(this, "Error xml", error);
+ QMessageBox::critical(this, RaptorMenu::XML_ERROR_DESC, error);
ui_tab->setCurrentIndex(TEXT_VIEW_TAB);
}
}
--- trunk/playground/base/raptormenu/tomedit/tomeditorform.h #781937:781938
@@ -6,12 +6,12 @@
#include"ui_tom-edit.h"
#include "manxml.h"
-
class QPushButton;
class QTextEdit;
class QTreeWidget;
class QLabel;
class QLineEdit;
+
namespace RaptorMenu
{
class TomEditorForm : public QWidget
@@ -44,6 +44,7 @@
void reloadTreeView();
enum Commands { DEL, FIND };
+ enum TypeID { TOM_SELECTED = 0, TASK_GRP_SELECTED = 1, TASK_ACT_SELECTED = 2, \
TASK_ITEM_SELECTED = 3 }; QString fullFilePath;
QWidget* loadUiFile();
QTextEdit *ui_mainTextEdit;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic