Merge sources dir branch devel to trunk

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2613 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2013-11-14 10:11:22 +00:00
parent 434849c3eb
commit 971ce1facb
54 changed files with 594 additions and 1152 deletions

View File

@@ -21,7 +21,6 @@
class ElementsCategoriesWidget;
class ElementsCategory;
class NamesListWidget;
class OrientationSetWidget;
class QFileNameEdit;
/**
This class provides a wizard dialog enabling users to to specify the basic
@@ -31,9 +30,6 @@ class QFileNameEdit;
- the category the element should be saved to
- the filename the element should be saved to
- localized names
- dimensions
- hotspot position
- allowed and default orientations
*/
class NewElementWizard : public QWizard {
Q_OBJECT
@@ -53,11 +49,10 @@ class NewElementWizard : public QWizard {
// attributes
private:
enum WizardState { Category, Filename, Names, Dimensions, Orientations };
enum WizardState { Category, Filename, Names };
ElementsCategoriesWidget *categories_list;
QFileNameEdit *qle_filename;
NamesListWidget *element_names;
OrientationSetWidget *orientation_set;
WizardState current_state;
QString chosen_file;
ElementsCategory *chosen_category;
@@ -67,7 +62,6 @@ class NewElementWizard : public QWizard {
QWizardPage *buildStep1();
QWizardPage *buildStep2();
QWizardPage *buildStep3();
QWizardPage *buildStep4();
bool validStep1();
bool validStep2();
bool validateCurrentPage();