-rw-r--r-- | noncore/apps/opie-sheet/cellformat.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/cellformat.h | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/finddlg.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/finddlg.h | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/main.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.h | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/numberdlg.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/numberdlg.h | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sheet.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sheet.h | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sortdlg.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sortdlg.h | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/textdlg.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/textdlg.h | 14 |
15 files changed, 210 insertions, 0 deletions
diff --git a/noncore/apps/opie-sheet/cellformat.cpp b/noncore/apps/opie-sheet/cellformat.cpp index 6a2ff72..597502c 100644 --- a/noncore/apps/opie-sheet/cellformat.cpp +++ b/noncore/apps/opie-sheet/cellformat.cpp | |||
@@ -1,128 +1,142 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #include "cellformat.h" | 15 | #include "cellformat.h" |
2 | 16 | ||
3 | #include <qlistbox.h> | 17 | #include <qlistbox.h> |
4 | #include <qlabel.h> | 18 | #include <qlabel.h> |
5 | 19 | ||
6 | #define COMBO_WIDTHS 155 | 20 | #define COMBO_WIDTHS 155 |
7 | #define COMBO_HEIGHTS 21 | 21 | #define COMBO_HEIGHTS 21 |
8 | 22 | ||
9 | #define COLOR_COUNT 17 | 23 | #define COLOR_COUNT 17 |
10 | #define STYLE_COUNT 14 | 24 | #define STYLE_COUNT 14 |
11 | #define HALIGN_COUNT 3 | 25 | #define HALIGN_COUNT 3 |
12 | #define VALIGN_COUNT 3 | 26 | #define VALIGN_COUNT 3 |
13 | 27 | ||
14 | QColor qtColors[COLOR_COUNT]={Qt::black, Qt::white, Qt::darkGray, Qt::gray, Qt::lightGray, Qt::red, Qt::green, Qt::blue, Qt::cyan, Qt::magenta, Qt::yellow, Qt::darkRed, Qt::darkGreen, Qt::darkBlue, Qt::darkCyan, Qt::darkMagenta, Qt::darkYellow}; | 28 | QColor qtColors[COLOR_COUNT]={Qt::black, Qt::white, Qt::darkGray, Qt::gray, Qt::lightGray, Qt::red, Qt::green, Qt::blue, Qt::cyan, Qt::magenta, Qt::yellow, Qt::darkRed, Qt::darkGreen, Qt::darkBlue, Qt::darkCyan, Qt::darkMagenta, Qt::darkYellow}; |
15 | Qt::BrushStyle brushStyles[STYLE_COUNT]={Qt::SolidPattern, Qt::Dense1Pattern, Qt::Dense2Pattern, Qt::Dense3Pattern, Qt::Dense4Pattern, Qt::Dense5Pattern, Qt::Dense6Pattern, Qt::Dense7Pattern, Qt::HorPattern, Qt::VerPattern, Qt::CrossPattern, Qt::BDiagPattern, Qt::FDiagPattern, Qt::DiagCrossPattern}; | 29 | Qt::BrushStyle brushStyles[STYLE_COUNT]={Qt::SolidPattern, Qt::Dense1Pattern, Qt::Dense2Pattern, Qt::Dense3Pattern, Qt::Dense4Pattern, Qt::Dense5Pattern, Qt::Dense6Pattern, Qt::Dense7Pattern, Qt::HorPattern, Qt::VerPattern, Qt::CrossPattern, Qt::BDiagPattern, Qt::FDiagPattern, Qt::DiagCrossPattern}; |
16 | QString namesHAlign[HALIGN_COUNT]={"Left", "Right", "Center"}; | 30 | QString namesHAlign[HALIGN_COUNT]={"Left", "Right", "Center"}; |
17 | QString namesVAlign[VALIGN_COUNT]={"Top", "Bottom", "Center"}; | 31 | QString namesVAlign[VALIGN_COUNT]={"Top", "Bottom", "Center"}; |
18 | Qt::AlignmentFlags flagsHAlign[HALIGN_COUNT]={Qt::AlignLeft, Qt::AlignRight, Qt::AlignHCenter}; | 32 | Qt::AlignmentFlags flagsHAlign[HALIGN_COUNT]={Qt::AlignLeft, Qt::AlignRight, Qt::AlignHCenter}; |
19 | Qt::AlignmentFlags flagsVAlign[VALIGN_COUNT]={Qt::AlignTop, Qt::AlignBottom, Qt::AlignVCenter}; | 33 | Qt::AlignmentFlags flagsVAlign[VALIGN_COUNT]={Qt::AlignTop, Qt::AlignBottom, Qt::AlignVCenter}; |
20 | 34 | ||
21 | CellFormat::CellFormat(QWidget *parent=0) | 35 | CellFormat::CellFormat(QWidget *parent=0) |
22 | :QDialog(parent, 0, TRUE) | 36 | :QDialog(parent, 0, TRUE) |
23 | { | 37 | { |
24 | // Main widget | 38 | // Main widget |
25 | tabs=new QTabWidget(this); | 39 | tabs=new QTabWidget(this); |
26 | widgetBorders=new QWidget(tabs); | 40 | widgetBorders=new QWidget(tabs); |
27 | widgetBackground=new QWidget(tabs); | 41 | widgetBackground=new QWidget(tabs); |
28 | widgetFont=new QWidget(tabs); | 42 | widgetFont=new QWidget(tabs); |
29 | widgetAlignment=new QWidget(tabs); | 43 | widgetAlignment=new QWidget(tabs); |
30 | tabs->addTab(widgetBorders, tr("&Borders")); | 44 | tabs->addTab(widgetBorders, tr("&Borders")); |
31 | tabs->addTab(widgetBackground, tr("Back&ground")); | 45 | tabs->addTab(widgetBackground, tr("Back&ground")); |
32 | tabs->addTab(widgetFont, tr("&Font")); | 46 | tabs->addTab(widgetFont, tr("&Font")); |
33 | tabs->addTab(widgetAlignment, tr("&Alignment")); | 47 | tabs->addTab(widgetAlignment, tr("&Alignment")); |
34 | 48 | ||
35 | fontDB.loadRenderers(); | 49 | fontDB.loadRenderers(); |
36 | changedFont=changedAlign=changedBrush=FALSE; | 50 | changedFont=changedAlign=changedBrush=FALSE; |
37 | 51 | ||
38 | // Borders tab | 52 | // Borders tab |
39 | borderEditor=new BorderEditor(widgetBorders); | 53 | borderEditor=new BorderEditor(widgetBorders); |
40 | borderEditor->setGeometry(10, 10, 215, 145); | 54 | borderEditor->setGeometry(10, 10, 215, 145); |
41 | connect(borderEditor, SIGNAL(clicked(BorderEditor::BorderArea)), this, SLOT(borderClicked(BorderEditor::BorderArea))); | 55 | connect(borderEditor, SIGNAL(clicked(BorderEditor::BorderArea)), this, SLOT(borderClicked(BorderEditor::BorderArea))); |
42 | 56 | ||
43 | comboBordersWidth=createCombo(COMBO_WIDTH, widgetBorders, tr("&Width:"), 165); | 57 | comboBordersWidth=createCombo(COMBO_WIDTH, widgetBorders, tr("&Width:"), 165); |
44 | comboBordersColor=createCombo(COMBO_COLOR, widgetBorders, tr("&Color:"), 165+(COMBO_HEIGHTS+10)); | 58 | comboBordersColor=createCombo(COMBO_COLOR, widgetBorders, tr("&Color:"), 165+(COMBO_HEIGHTS+10)); |
45 | 59 | ||
46 | buttonBordersDefaults=new QPushButton(tr("&Default Borders"), widgetBorders); | 60 | buttonBordersDefaults=new QPushButton(tr("&Default Borders"), widgetBorders); |
47 | buttonBordersDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS); | 61 | buttonBordersDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS); |
48 | connect(buttonBordersDefaults, SIGNAL(clicked()), this, SLOT(slotBordersDefaults())); | 62 | connect(buttonBordersDefaults, SIGNAL(clicked()), this, SLOT(slotBordersDefaults())); |
49 | 63 | ||
50 | // Background tab | 64 | // Background tab |
51 | frameBackground=new QFrame(widgetBackground); | 65 | frameBackground=new QFrame(widgetBackground); |
52 | frameBackground->setGeometry(10, 10, 215, 145); | 66 | frameBackground->setGeometry(10, 10, 215, 145); |
53 | frameBackground->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); | 67 | frameBackground->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); |
54 | 68 | ||
55 | comboBackgroundStyle=createCombo(COMBO_STYLE, widgetBackground, tr("&Style:"), 165); | 69 | comboBackgroundStyle=createCombo(COMBO_STYLE, widgetBackground, tr("&Style:"), 165); |
56 | connect(comboBackgroundStyle, SIGNAL(activated(int)), this, SLOT(backgroundClicked(int))); | 70 | connect(comboBackgroundStyle, SIGNAL(activated(int)), this, SLOT(backgroundClicked(int))); |
57 | comboBackgroundColor=createCombo(COMBO_COLOR, widgetBackground, tr("&Color:"), 165+(COMBO_HEIGHTS+10)); | 71 | comboBackgroundColor=createCombo(COMBO_COLOR, widgetBackground, tr("&Color:"), 165+(COMBO_HEIGHTS+10)); |
58 | connect(comboBackgroundColor, SIGNAL(activated(int)), this, SLOT(backgroundClicked(int))); | 72 | connect(comboBackgroundColor, SIGNAL(activated(int)), this, SLOT(backgroundClicked(int))); |
59 | 73 | ||
60 | buttonBackgroundDefaults=new QPushButton(tr("&Default Background"), widgetBackground); | 74 | buttonBackgroundDefaults=new QPushButton(tr("&Default Background"), widgetBackground); |
61 | buttonBackgroundDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS); | 75 | buttonBackgroundDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS); |
62 | connect(buttonBackgroundDefaults, SIGNAL(clicked()), this, SLOT(slotBackgroundDefaults())); | 76 | connect(buttonBackgroundDefaults, SIGNAL(clicked()), this, SLOT(slotBackgroundDefaults())); |
63 | 77 | ||
64 | // Font tab | 78 | // Font tab |
65 | frameFont=new QFrame(widgetFont); | 79 | frameFont=new QFrame(widgetFont); |
66 | frameFont->setGeometry(10, 10, 215, 125); | 80 | frameFont->setGeometry(10, 10, 215, 125); |
67 | frameFont->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); | 81 | frameFont->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); |
68 | 82 | ||
69 | comboFontFamily=createCombo(COMBO_FONT, widgetFont, tr("&Font:"), 145); | 83 | comboFontFamily=createCombo(COMBO_FONT, widgetFont, tr("&Font:"), 145); |
70 | connect(comboFontFamily, SIGNAL(activated(int)), this, SLOT(fontClicked(int))); | 84 | connect(comboFontFamily, SIGNAL(activated(int)), this, SLOT(fontClicked(int))); |
71 | comboFontSize=createCombo(COMBO_SIZE, widgetFont, tr("&Size:"), 145+(COMBO_HEIGHTS+10)); | 85 | comboFontSize=createCombo(COMBO_SIZE, widgetFont, tr("&Size:"), 145+(COMBO_HEIGHTS+10)); |
72 | connect(comboFontSize, SIGNAL(activated(int)), this, SLOT(fontClicked(int))); | 86 | connect(comboFontSize, SIGNAL(activated(int)), this, SLOT(fontClicked(int))); |
73 | comboFontColor=createCombo(COMBO_COLOR, widgetFont, tr("&Color:"), 145+2*(COMBO_HEIGHTS+10)); | 87 | comboFontColor=createCombo(COMBO_COLOR, widgetFont, tr("&Color:"), 145+2*(COMBO_HEIGHTS+10)); |
74 | connect(comboFontColor, SIGNAL(activated(int)), this, SLOT(fontClicked(int))); | 88 | connect(comboFontColor, SIGNAL(activated(int)), this, SLOT(fontClicked(int))); |
75 | 89 | ||
76 | checkFontBold=new QCheckBox(tr("&Bold"), widgetFont); | 90 | checkFontBold=new QCheckBox(tr("&Bold"), widgetFont); |
77 | checkFontBold->setGeometry(10, 145+3*(COMBO_HEIGHTS+10), 40, COMBO_HEIGHTS); | 91 | checkFontBold->setGeometry(10, 145+3*(COMBO_HEIGHTS+10), 40, COMBO_HEIGHTS); |
78 | connect(checkFontBold, SIGNAL(toggled(bool)), this, SLOT(fontClicked(bool))); | 92 | connect(checkFontBold, SIGNAL(toggled(bool)), this, SLOT(fontClicked(bool))); |
79 | checkFontItalic=new QCheckBox(tr("&Italic"), widgetFont); | 93 | checkFontItalic=new QCheckBox(tr("&Italic"), widgetFont); |
80 | checkFontItalic->setGeometry(60, 145+3*(COMBO_HEIGHTS+10), 40, COMBO_HEIGHTS); | 94 | checkFontItalic->setGeometry(60, 145+3*(COMBO_HEIGHTS+10), 40, COMBO_HEIGHTS); |
81 | connect(checkFontItalic, SIGNAL(toggled(bool)), this, SLOT(fontClicked(bool))); | 95 | connect(checkFontItalic, SIGNAL(toggled(bool)), this, SLOT(fontClicked(bool))); |
82 | 96 | ||
83 | buttonFontDefaults=new QPushButton(tr("&Default Font"), widgetFont); | 97 | buttonFontDefaults=new QPushButton(tr("&Default Font"), widgetFont); |
84 | buttonFontDefaults->setGeometry(115, 145+3*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS); | 98 | buttonFontDefaults->setGeometry(115, 145+3*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS); |
85 | connect(buttonFontDefaults, SIGNAL(clicked()), this, SLOT(slotFontDefaults())); | 99 | connect(buttonFontDefaults, SIGNAL(clicked()), this, SLOT(slotFontDefaults())); |
86 | 100 | ||
87 | // Alignment tab | 101 | // Alignment tab |
88 | frameAlignment=new QFrame(widgetAlignment); | 102 | frameAlignment=new QFrame(widgetAlignment); |
89 | frameAlignment->setGeometry(10, 10, 215, 145); | 103 | frameAlignment->setGeometry(10, 10, 215, 145); |
90 | frameAlignment->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); | 104 | frameAlignment->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); |
91 | 105 | ||
92 | comboAlignmentVertical=createCombo(COMBO_VALIGN, widgetAlignment, tr("&Vertical:"), 165); | 106 | comboAlignmentVertical=createCombo(COMBO_VALIGN, widgetAlignment, tr("&Vertical:"), 165); |
93 | connect(comboAlignmentVertical, SIGNAL(activated(int)), this, SLOT(alignClicked(int))); | 107 | connect(comboAlignmentVertical, SIGNAL(activated(int)), this, SLOT(alignClicked(int))); |
94 | comboAlignmentHorizontal=createCombo(COMBO_HALIGN, widgetAlignment, tr("&Horizontal:"), 165+(COMBO_HEIGHTS+10)); | 108 | comboAlignmentHorizontal=createCombo(COMBO_HALIGN, widgetAlignment, tr("&Horizontal:"), 165+(COMBO_HEIGHTS+10)); |
95 | connect(comboAlignmentHorizontal, SIGNAL(activated(int)), this, SLOT(alignClicked(int))); | 109 | connect(comboAlignmentHorizontal, SIGNAL(activated(int)), this, SLOT(alignClicked(int))); |
96 | 110 | ||
97 | checkAlignmentWrap=new QCheckBox(tr("&Word Wrap"), widgetAlignment); | 111 | checkAlignmentWrap=new QCheckBox(tr("&Word Wrap"), widgetAlignment); |
98 | checkAlignmentWrap->setGeometry(10, 165+2*(COMBO_HEIGHTS+10), 90, COMBO_HEIGHTS); | 112 | checkAlignmentWrap->setGeometry(10, 165+2*(COMBO_HEIGHTS+10), 90, COMBO_HEIGHTS); |
99 | connect(checkAlignmentWrap, SIGNAL(toggled(bool)), this, SLOT(alignClicked(bool))); | 113 | connect(checkAlignmentWrap, SIGNAL(toggled(bool)), this, SLOT(alignClicked(bool))); |
100 | 114 | ||
101 | buttonAlignmentDefaults=new QPushButton(tr("&Default Alignment"), widgetAlignment); | 115 | buttonAlignmentDefaults=new QPushButton(tr("&Default Alignment"), widgetAlignment); |
102 | buttonAlignmentDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS); | 116 | buttonAlignmentDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS); |
103 | connect(buttonAlignmentDefaults, SIGNAL(clicked()), this, SLOT(slotAlignmentDefaults())); | 117 | connect(buttonAlignmentDefaults, SIGNAL(clicked()), this, SLOT(slotAlignmentDefaults())); |
104 | 118 | ||
105 | // Main widget | 119 | // Main widget |
106 | box=new QVBoxLayout(this); | 120 | box=new QVBoxLayout(this); |
107 | box->addWidget(tabs); | 121 | box->addWidget(tabs); |
108 | 122 | ||
109 | setCaption(tr("Format Cells")); | 123 | setCaption(tr("Format Cells")); |
110 | } | 124 | } |
111 | 125 | ||
112 | CellFormat::~CellFormat() | 126 | CellFormat::~CellFormat() |
113 | { | 127 | { |
114 | } | 128 | } |
115 | 129 | ||
116 | int CellFormat::findColorIndex(const QColor &color) | 130 | int CellFormat::findColorIndex(const QColor &color) |
117 | { | 131 | { |
118 | for (int i=0; i<COLOR_COUNT; ++i) | 132 | for (int i=0; i<COLOR_COUNT; ++i) |
119 | if (qtColors[i]==color) | 133 | if (qtColors[i]==color) |
120 | return i; | 134 | return i; |
121 | return 0; | 135 | return 0; |
122 | } | 136 | } |
123 | 137 | ||
124 | int CellFormat::findVAlignIndex(Qt::AlignmentFlags flag) | 138 | int CellFormat::findVAlignIndex(Qt::AlignmentFlags flag) |
125 | { | 139 | { |
126 | for (int i=0; i<VALIGN_COUNT; ++i) | 140 | for (int i=0; i<VALIGN_COUNT; ++i) |
127 | if (flagsVAlign[i] & flag) | 141 | if (flagsVAlign[i] & flag) |
128 | return i; | 142 | return i; |
diff --git a/noncore/apps/opie-sheet/cellformat.h b/noncore/apps/opie-sheet/cellformat.h index b552153..b569b7f 100644 --- a/noncore/apps/opie-sheet/cellformat.h +++ b/noncore/apps/opie-sheet/cellformat.h | |||
@@ -1,106 +1,120 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #ifndef CELLFORMAT_H | 15 | #ifndef CELLFORMAT_H |
2 | #define CELLFORMAT_H | 16 | #define CELLFORMAT_H |
3 | 17 | ||
4 | #include <qpe/fontdatabase.h> | 18 | #include <qpe/fontdatabase.h> |
5 | #include <qdialog.h> | 19 | #include <qdialog.h> |
6 | #include <qtabwidget.h> | 20 | #include <qtabwidget.h> |
7 | #include <qlayout.h> | 21 | #include <qlayout.h> |
8 | #include <qcombobox.h> | 22 | #include <qcombobox.h> |
9 | #include <qcheckbox.h> | 23 | #include <qcheckbox.h> |
10 | #include <qpushbutton.h> | 24 | #include <qpushbutton.h> |
11 | 25 | ||
12 | #include "sheet.h" | 26 | #include "sheet.h" |
13 | 27 | ||
14 | class BorderEditor: public QFrame | 28 | class BorderEditor: public QFrame |
15 | { | 29 | { |
16 | Q_OBJECT | 30 | Q_OBJECT |
17 | 31 | ||
18 | // QT objects | 32 | // QT objects |
19 | QPen penTop, penBottom, penLeft, penRight, penHorz, penVert; | 33 | QPen penTop, penBottom, penLeft, penRight, penHorz, penVert; |
20 | 34 | ||
21 | // Private functions | 35 | // Private functions |
22 | void drawContents(QPainter *p); | 36 | void drawContents(QPainter *p); |
23 | 37 | ||
24 | // Reimplemented QFrame functions | 38 | // Reimplemented QFrame functions |
25 | void mouseReleaseEvent(QMouseEvent *e); | 39 | void mouseReleaseEvent(QMouseEvent *e); |
26 | 40 | ||
27 | public: | 41 | public: |
28 | // Definitions | 42 | // Definitions |
29 | enum BorderArea {None, Top, Bottom, Left, Right, Horz, Vert}; | 43 | enum BorderArea {None, Top, Bottom, Left, Right, Horz, Vert}; |
30 | 44 | ||
31 | BorderEditor(QWidget *parent=0); | 45 | BorderEditor(QWidget *parent=0); |
32 | ~BorderEditor(); | 46 | ~BorderEditor(); |
33 | 47 | ||
34 | void setPen(const QPen &pen, BorderArea area); | 48 | void setPen(const QPen &pen, BorderArea area); |
35 | QPen getPen(BorderArea area); | 49 | QPen getPen(BorderArea area); |
36 | QPen getDefaultPen() { return QPen(Qt::black, 1, Qt::DotLine); } | 50 | QPen getDefaultPen() { return QPen(Qt::black, 1, Qt::DotLine); } |
37 | 51 | ||
38 | signals: | 52 | signals: |
39 | void clicked(BorderEditor::BorderArea); | 53 | void clicked(BorderEditor::BorderArea); |
40 | }; | 54 | }; |
41 | 55 | ||
42 | class CellFormat: public QDialog | 56 | class CellFormat: public QDialog |
43 | { | 57 | { |
44 | Q_OBJECT | 58 | Q_OBJECT |
45 | 59 | ||
46 | enum comboType {COMBO_OTHER, COMBO_WIDTH, COMBO_FONT, COMBO_SIZE, COMBO_STYLE, COMBO_COLOR, COMBO_VALIGN, COMBO_HALIGN}; | 60 | enum comboType {COMBO_OTHER, COMBO_WIDTH, COMBO_FONT, COMBO_SIZE, COMBO_STYLE, COMBO_COLOR, COMBO_VALIGN, COMBO_HALIGN}; |
47 | 61 | ||
48 | // QT objects | 62 | // QT objects |
49 | QBoxLayout *box; | 63 | QBoxLayout *box; |
50 | QTabWidget *tabs; | 64 | QTabWidget *tabs; |
51 | QWidget *widgetBorders, *widgetBackground, *widgetFont, *widgetAlignment; | 65 | QWidget *widgetBorders, *widgetBackground, *widgetFont, *widgetAlignment; |
52 | QComboBox *comboBordersWidth, *comboBordersColor, *comboBackgroundColor, *comboBackgroundStyle, *comboFontColor, *comboFontSize, *comboFontFamily, *comboAlignmentVertical, *comboAlignmentHorizontal; | 66 | QComboBox *comboBordersWidth, *comboBordersColor, *comboBackgroundColor, *comboBackgroundStyle, *comboFontColor, *comboFontSize, *comboFontFamily, *comboAlignmentVertical, *comboAlignmentHorizontal; |
53 | QCheckBox *checkFontBold, *checkFontItalic, *checkAlignmentWrap; | 67 | QCheckBox *checkFontBold, *checkFontItalic, *checkAlignmentWrap; |
54 | QPushButton *buttonBordersDefaults, *buttonBackgroundDefaults, *buttonFontDefaults, *buttonAlignmentDefaults; | 68 | QPushButton *buttonBordersDefaults, *buttonBackgroundDefaults, *buttonFontDefaults, *buttonAlignmentDefaults; |
55 | QFrame *frameBackground, *frameFont, *frameAlignment; | 69 | QFrame *frameBackground, *frameFont, *frameAlignment; |
56 | QBrush brushBackground; | 70 | QBrush brushBackground; |
57 | QFont fontFont; | 71 | QFont fontFont; |
58 | QColor fontColor; | 72 | QColor fontColor; |
59 | Qt::AlignmentFlags textAlignment; | 73 | Qt::AlignmentFlags textAlignment; |
60 | FontDatabase fontDB; | 74 | FontDatabase fontDB; |
61 | 75 | ||
62 | // Other objects & variables | 76 | // Other objects & variables |
63 | Sheet *sheet; | 77 | Sheet *sheet; |
64 | BorderEditor *borderEditor; | 78 | BorderEditor *borderEditor; |
65 | bool changedFont, changedAlign, changedBrush; | 79 | bool changedFont, changedAlign, changedBrush; |
66 | 80 | ||
67 | // Private functions | 81 | // Private functions |
68 | void createWidthCombo(QComboBox *combo); | 82 | void createWidthCombo(QComboBox *combo); |
69 | void createFontCombo(QComboBox *combo); | 83 | void createFontCombo(QComboBox *combo); |
70 | void createHAlignCombo(QComboBox *combo); | 84 | void createHAlignCombo(QComboBox *combo); |
71 | void createVAlignCombo(QComboBox *combo); | 85 | void createVAlignCombo(QComboBox *combo); |
72 | void createStyleCombo(QComboBox *combo); | 86 | void createStyleCombo(QComboBox *combo); |
73 | void createSizeCombo(QComboBox *combo); | 87 | void createSizeCombo(QComboBox *combo); |
74 | void createColorCombo(QComboBox *combo); | 88 | void createColorCombo(QComboBox *combo); |
75 | QComboBox *createCombo(comboType type, QWidget *parent, const QString &caption, int y); | 89 | QComboBox *createCombo(comboType type, QWidget *parent, const QString &caption, int y); |
76 | 90 | ||
77 | int findHAlignIndex(Qt::AlignmentFlags flag); | 91 | int findHAlignIndex(Qt::AlignmentFlags flag); |
78 | int findVAlignIndex(Qt::AlignmentFlags flag); | 92 | int findVAlignIndex(Qt::AlignmentFlags flag); |
79 | int findComboItemIndex(QComboBox *combo, const QString &item); | 93 | int findComboItemIndex(QComboBox *combo, const QString &item); |
80 | int findColorIndex(const QColor &color); | 94 | int findColorIndex(const QColor &color); |
81 | int findBrushStyleIndex(Qt::BrushStyle style); | 95 | int findBrushStyleIndex(Qt::BrushStyle style); |
82 | 96 | ||
83 | private slots: | 97 | private slots: |
84 | void borderClicked(BorderEditor::BorderArea area); | 98 | void borderClicked(BorderEditor::BorderArea area); |
85 | void backgroundClicked(int index); | 99 | void backgroundClicked(int index); |
86 | void fontClicked(bool on); | 100 | void fontClicked(bool on); |
87 | void fontClicked(int index); | 101 | void fontClicked(int index); |
88 | void alignClicked(bool on); | 102 | void alignClicked(bool on); |
89 | void alignClicked(int index); | 103 | void alignClicked(int index); |
90 | void slotBordersDefaults(); | 104 | void slotBordersDefaults(); |
91 | void slotBackgroundDefaults(); | 105 | void slotBackgroundDefaults(); |
92 | void slotFontDefaults(); | 106 | void slotFontDefaults(); |
93 | void slotAlignmentDefaults(); | 107 | void slotAlignmentDefaults(); |
94 | 108 | ||
95 | public: | 109 | public: |
96 | CellFormat(QWidget *parent=0); | 110 | CellFormat(QWidget *parent=0); |
97 | ~CellFormat(); | 111 | ~CellFormat(); |
98 | 112 | ||
99 | int exec(Sheet *s); | 113 | int exec(Sheet *s); |
100 | 114 | ||
101 | void setTextAlign(Qt::AlignmentFlags flags); | 115 | void setTextAlign(Qt::AlignmentFlags flags); |
102 | void setTextFont(const QFont &font, const QColor &color); | 116 | void setTextFont(const QFont &font, const QColor &color); |
103 | void setBrushBackground(const QBrush &brush); | 117 | void setBrushBackground(const QBrush &brush); |
104 | }; | 118 | }; |
105 | 119 | ||
106 | #endif | 120 | #endif |
diff --git a/noncore/apps/opie-sheet/finddlg.cpp b/noncore/apps/opie-sheet/finddlg.cpp index cfe2f82..d1237ca 100644 --- a/noncore/apps/opie-sheet/finddlg.cpp +++ b/noncore/apps/opie-sheet/finddlg.cpp | |||
@@ -1,70 +1,84 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #include <qlabel.h> | 15 | #include <qlabel.h> |
2 | #include <qradiobutton.h> | 16 | #include <qradiobutton.h> |
3 | #include "finddlg.h" | 17 | #include "finddlg.h" |
4 | 18 | ||
5 | FindDialog::FindDialog(QWidget *parent=0) | 19 | FindDialog::FindDialog(QWidget *parent=0) |
6 | :QDialog(parent, 0, TRUE) | 20 | :QDialog(parent, 0, TRUE) |
7 | { | 21 | { |
8 | // Main widget | 22 | // Main widget |
9 | tabs=new QTabWidget(this); | 23 | tabs=new QTabWidget(this); |
10 | widgetFind=new QWidget(tabs); | 24 | widgetFind=new QWidget(tabs); |
11 | widgetOptions=new QWidget(tabs); | 25 | widgetOptions=new QWidget(tabs); |
12 | tabs->addTab(widgetFind, tr("&Find && Replace")); | 26 | tabs->addTab(widgetFind, tr("&Find && Replace")); |
13 | tabs->addTab(widgetOptions, tr("&Options")); | 27 | tabs->addTab(widgetOptions, tr("&Options")); |
14 | 28 | ||
15 | // Find tab | 29 | // Find tab |
16 | QLabel *label=new QLabel(tr("&Search for:"), widgetFind); | 30 | QLabel *label=new QLabel(tr("&Search for:"), widgetFind); |
17 | label->setGeometry(10, 10, 215, 20); | 31 | label->setGeometry(10, 10, 215, 20); |
18 | editFind=new QLineEdit(widgetFind); | 32 | editFind=new QLineEdit(widgetFind); |
19 | editFind->setGeometry(10, 40, 215, 20); | 33 | editFind->setGeometry(10, 40, 215, 20); |
20 | label->setBuddy(editFind); | 34 | label->setBuddy(editFind); |
21 | 35 | ||
22 | label=new QLabel(tr("&Replace with:"), widgetFind); | 36 | label=new QLabel(tr("&Replace with:"), widgetFind); |
23 | label->setGeometry(10, 80, 215, 20); | 37 | label->setGeometry(10, 80, 215, 20); |
24 | editReplace=new QLineEdit(widgetFind); | 38 | editReplace=new QLineEdit(widgetFind); |
25 | editReplace->setGeometry(10, 110, 215, 20); | 39 | editReplace->setGeometry(10, 110, 215, 20); |
26 | editReplace->setEnabled(FALSE); | 40 | editReplace->setEnabled(FALSE); |
27 | label->setBuddy(editReplace); | 41 | label->setBuddy(editReplace); |
28 | 42 | ||
29 | groupType=new QVButtonGroup(tr("&Type"), widgetFind); | 43 | groupType=new QVButtonGroup(tr("&Type"), widgetFind); |
30 | groupType->setGeometry(10, 150, 215, 90); | 44 | groupType->setGeometry(10, 150, 215, 90); |
31 | QRadioButton *radio=new QRadioButton(tr("&Find"), groupType); | 45 | QRadioButton *radio=new QRadioButton(tr("&Find"), groupType); |
32 | radio=new QRadioButton(tr("&Replace"), groupType); | 46 | radio=new QRadioButton(tr("&Replace"), groupType); |
33 | radio=new QRadioButton(tr("Replace &all"), groupType); | 47 | radio=new QRadioButton(tr("Replace &all"), groupType); |
34 | groupType->setButton(0); | 48 | groupType->setButton(0); |
35 | connect(groupType, SIGNAL(clicked(int)), this, SLOT(typeChanged(int))); | 49 | connect(groupType, SIGNAL(clicked(int)), this, SLOT(typeChanged(int))); |
36 | 50 | ||
37 | // Options tab | 51 | // Options tab |
38 | checkCase=new QCheckBox(tr("Match &case"), widgetOptions); | 52 | checkCase=new QCheckBox(tr("Match &case"), widgetOptions); |
39 | checkCase->setGeometry(10, 10, 215, 20); | 53 | checkCase->setGeometry(10, 10, 215, 20); |
40 | checkSelection=new QCheckBox(tr("Current &selection only"), widgetOptions); | 54 | checkSelection=new QCheckBox(tr("Current &selection only"), widgetOptions); |
41 | checkSelection->setGeometry(10, 40, 215, 20); | 55 | checkSelection->setGeometry(10, 40, 215, 20); |
42 | checkEntire=new QCheckBox(tr("&Entire cell"), widgetOptions); | 56 | checkEntire=new QCheckBox(tr("&Entire cell"), widgetOptions); |
43 | checkEntire->setGeometry(10, 70, 215, 20); | 57 | checkEntire->setGeometry(10, 70, 215, 20); |
44 | 58 | ||
45 | // Main widget | 59 | // Main widget |
46 | box=new QVBoxLayout(this); | 60 | box=new QVBoxLayout(this); |
47 | box->addWidget(tabs); | 61 | box->addWidget(tabs); |
48 | 62 | ||
49 | setCaption(tr("Find & Replace")); | 63 | setCaption(tr("Find & Replace")); |
50 | } | 64 | } |
51 | 65 | ||
52 | FindDialog::~FindDialog() | 66 | FindDialog::~FindDialog() |
53 | { | 67 | { |
54 | } | 68 | } |
55 | 69 | ||
56 | void FindDialog::typeChanged(int id) | 70 | void FindDialog::typeChanged(int id) |
57 | { | 71 | { |
58 | editReplace->setEnabled(id>0); | 72 | editReplace->setEnabled(id>0); |
59 | } | 73 | } |
60 | 74 | ||
61 | int FindDialog::exec(Sheet *s) | 75 | int FindDialog::exec(Sheet *s) |
62 | { | 76 | { |
63 | if (QDialog::exec()==QDialog::Accepted) | 77 | if (QDialog::exec()==QDialog::Accepted) |
64 | { | 78 | { |
65 | int id=groupType->id(groupType->selected()); | 79 | int id=groupType->id(groupType->selected()); |
66 | s->dataFindReplace(editFind->text(), editReplace->text(), checkCase->isChecked(), !checkSelection->isChecked(), checkEntire->isChecked(), id>0, id>1); | 80 | s->dataFindReplace(editFind->text(), editReplace->text(), checkCase->isChecked(), !checkSelection->isChecked(), checkEntire->isChecked(), id>0, id>1); |
67 | return QDialog::Accepted; | 81 | return QDialog::Accepted; |
68 | } | 82 | } |
69 | return QDialog::Rejected; | 83 | return QDialog::Rejected; |
70 | } | 84 | } |
diff --git a/noncore/apps/opie-sheet/finddlg.h b/noncore/apps/opie-sheet/finddlg.h index 02c9cdd..1af2da5 100644 --- a/noncore/apps/opie-sheet/finddlg.h +++ b/noncore/apps/opie-sheet/finddlg.h | |||
@@ -1,35 +1,49 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #ifndef FINDDLG_H | 15 | #ifndef FINDDLG_H |
2 | #define FINDDLG_H | 16 | #define FINDDLG_H |
3 | 17 | ||
4 | #include <qdialog.h> | 18 | #include <qdialog.h> |
5 | #include <qtabwidget.h> | 19 | #include <qtabwidget.h> |
6 | #include <qlayout.h> | 20 | #include <qlayout.h> |
7 | #include <qlineedit.h> | 21 | #include <qlineedit.h> |
8 | #include <qcheckbox.h> | 22 | #include <qcheckbox.h> |
9 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
10 | #include <qvbuttongroup.h> | 24 | #include <qvbuttongroup.h> |
11 | #include "sheet.h" | 25 | #include "sheet.h" |
12 | 26 | ||
13 | class FindDialog: public QDialog | 27 | class FindDialog: public QDialog |
14 | { | 28 | { |
15 | Q_OBJECT | 29 | Q_OBJECT |
16 | 30 | ||
17 | // QT objects | 31 | // QT objects |
18 | QBoxLayout *box; | 32 | QBoxLayout *box; |
19 | QTabWidget *tabs; | 33 | QTabWidget *tabs; |
20 | QWidget *widgetFind, *widgetOptions; | 34 | QWidget *widgetFind, *widgetOptions; |
21 | QCheckBox *checkCase, *checkSelection, *checkEntire; | 35 | QCheckBox *checkCase, *checkSelection, *checkEntire; |
22 | QLineEdit *editFind, *editReplace; | 36 | QLineEdit *editFind, *editReplace; |
23 | QVButtonGroup *groupType; | 37 | QVButtonGroup *groupType; |
24 | 38 | ||
25 | private slots: | 39 | private slots: |
26 | void typeChanged(int id); | 40 | void typeChanged(int id); |
27 | 41 | ||
28 | public: | 42 | public: |
29 | FindDialog(QWidget *parent=0); | 43 | FindDialog(QWidget *parent=0); |
30 | ~FindDialog(); | 44 | ~FindDialog(); |
31 | 45 | ||
32 | int exec(Sheet *s); | 46 | int exec(Sheet *s); |
33 | }; | 47 | }; |
34 | 48 | ||
35 | #endif | 49 | #endif |
diff --git a/noncore/apps/opie-sheet/main.cpp b/noncore/apps/opie-sheet/main.cpp index 236a579..e42b4a5 100644 --- a/noncore/apps/opie-sheet/main.cpp +++ b/noncore/apps/opie-sheet/main.cpp | |||
@@ -1,14 +1,28 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
2 | 16 | ||
3 | #include "mainwindow.h" | 17 | #include "mainwindow.h" |
4 | 18 | ||
5 | int main(int argc, char **argv) | 19 | int main(int argc, char **argv) |
6 | { | 20 | { |
7 | QPEApplication application(argc, argv); | 21 | QPEApplication application(argc, argv); |
8 | 22 | ||
9 | MainWindow windowMain; | 23 | MainWindow windowMain; |
10 | windowMain.setHelpFile(application.qpeDir()+"/help/html/"+QString(argv[0])+".html"); | 24 | windowMain.setHelpFile(application.qpeDir()+"/help/html/"+QString(argv[0])+".html"); |
11 | application.showMainDocumentWidget(&windowMain); | 25 | application.showMainDocumentWidget(&windowMain); |
12 | 26 | ||
13 | return application.exec(); | 27 | return application.exec(); |
14 | } | 28 | } |
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp index a7441b1..9d69b8a 100644 --- a/noncore/apps/opie-sheet/mainwindow.cpp +++ b/noncore/apps/opie-sheet/mainwindow.cpp | |||
@@ -1,128 +1,142 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #include "mainwindow.h" | 15 | #include "mainwindow.h" |
2 | 16 | ||
3 | #include <qpe/filemanager.h> | 17 | #include <qpe/filemanager.h> |
4 | #include <qpe/qcopenvelope_qws.h> | 18 | #include <qpe/qcopenvelope_qws.h> |
5 | #include <qmessagebox.h> | 19 | #include <qmessagebox.h> |
6 | #include <qfile.h> | 20 | #include <qfile.h> |
7 | #include <qradiobutton.h> | 21 | #include <qradiobutton.h> |
8 | #include "cellformat.h" | 22 | #include "cellformat.h" |
9 | #include "numberdlg.h" | 23 | #include "numberdlg.h" |
10 | #include "textdlg.h" | 24 | #include "textdlg.h" |
11 | #include "sortdlg.h" | 25 | #include "sortdlg.h" |
12 | #include "finddlg.h" | 26 | #include "finddlg.h" |
13 | 27 | ||
14 | #include "file-new.xpm" | 28 | #include "file-new.xpm" |
15 | #include "file-open.xpm" | 29 | #include "file-open.xpm" |
16 | #include "file-save.xpm" | 30 | #include "file-save.xpm" |
17 | #include "edit-cancel.xpm" | 31 | #include "edit-cancel.xpm" |
18 | #include "edit-accept.xpm" | 32 | #include "edit-accept.xpm" |
19 | #include "help-general.xpm" | 33 | #include "help-general.xpm" |
20 | #include "func-plus.xpm" | 34 | #include "func-plus.xpm" |
21 | #include "func-minus.xpm" | 35 | #include "func-minus.xpm" |
22 | #include "func-cross.xpm" | 36 | #include "func-cross.xpm" |
23 | #include "func-divide.xpm" | 37 | #include "func-divide.xpm" |
24 | #include "func-paran-open.xpm" | 38 | #include "func-paran-open.xpm" |
25 | #include "func-paran-close.xpm" | 39 | #include "func-paran-close.xpm" |
26 | #include "func-comma.xpm" | 40 | #include "func-comma.xpm" |
27 | #include "func-func.xpm" | 41 | #include "func-func.xpm" |
28 | #include "func-equal.xpm" | 42 | #include "func-equal.xpm" |
29 | #include "cell-select.xpm" | 43 | #include "cell-select.xpm" |
30 | 44 | ||
31 | #define DEFAULT_NUM_ROWS 199 | 45 | #define DEFAULT_NUM_ROWS 199 |
32 | #define DEFAULT_NUM_COLS (26*3) | 46 | #define DEFAULT_NUM_COLS (26*3) |
33 | #define DEFAULT_NUM_SHEETS 3 | 47 | #define DEFAULT_NUM_SHEETS 3 |
34 | 48 | ||
35 | MainWindow::MainWindow() | 49 | MainWindow::MainWindow() |
36 | :QMainWindow() | 50 | :QMainWindow() |
37 | { | 51 | { |
38 | // initialize variables | 52 | // initialize variables |
39 | documentModified=FALSE; | 53 | documentModified=FALSE; |
40 | 54 | ||
41 | // construct objects | 55 | // construct objects |
42 | fileSelector=new FileSelector("application/sheet-qt", this, QString::null); | 56 | fileSelector=new FileSelector("application/sheet-qt", this, QString::null); |
43 | connect(fileSelector, SIGNAL(closeMe()), this, SLOT(selectorHide())); | 57 | connect(fileSelector, SIGNAL(closeMe()), this, SLOT(selectorHide())); |
44 | connect(fileSelector, SIGNAL(newSelected(const DocLnk &)), this, SLOT(selectorFileNew(const DocLnk &))); | 58 | connect(fileSelector, SIGNAL(newSelected(const DocLnk &)), this, SLOT(selectorFileNew(const DocLnk &))); |
45 | connect(fileSelector, SIGNAL(fileSelected(const DocLnk &)), this, SLOT(selectorFileOpen(const DocLnk &))); | 59 | connect(fileSelector, SIGNAL(fileSelected(const DocLnk &)), this, SLOT(selectorFileOpen(const DocLnk &))); |
46 | 60 | ||
47 | listSheets.setAutoDelete(TRUE); | 61 | listSheets.setAutoDelete(TRUE); |
48 | 62 | ||
49 | initActions(); | 63 | initActions(); |
50 | initMenu(); | 64 | initMenu(); |
51 | initEditToolbar(); | 65 | initEditToolbar(); |
52 | initFunctionsToolbar(); | 66 | initFunctionsToolbar(); |
53 | initStandardToolbar(); | 67 | initStandardToolbar(); |
54 | initSheet(); | 68 | initSheet(); |
55 | 69 | ||
56 | // set window title | 70 | // set window title |
57 | setCaption(tr("Opie Sheet")); | 71 | setCaption(tr("Opie Sheet")); |
58 | 72 | ||
59 | // create sheets | 73 | // create sheets |
60 | selectorFileNew(currentDoc); | 74 | selectorFileNew(currentDoc); |
61 | } | 75 | } |
62 | 76 | ||
63 | MainWindow::~MainWindow() | 77 | MainWindow::~MainWindow() |
64 | { | 78 | { |
65 | } | 79 | } |
66 | 80 | ||
67 | void MainWindow::documentSave(DocLnk &lnkDoc) | 81 | void MainWindow::documentSave(DocLnk &lnkDoc) |
68 | { | 82 | { |
69 | FileManager fm; | 83 | FileManager fm; |
70 | QByteArray streamBuffer; | 84 | QByteArray streamBuffer; |
71 | QDataStream stream(streamBuffer, IO_WriteOnly); | 85 | QDataStream stream(streamBuffer, IO_WriteOnly); |
72 | 86 | ||
73 | typeSheet *currentSheet=findSheet(sheet->getName()); | 87 | typeSheet *currentSheet=findSheet(sheet->getName()); |
74 | if (!currentSheet) | 88 | if (!currentSheet) |
75 | { | 89 | { |
76 | QMessageBox::critical(this, tr("Error"), tr("Inconsistency error!")); | 90 | QMessageBox::critical(this, tr("Error"), tr("Inconsistency error!")); |
77 | return; | 91 | return; |
78 | } | 92 | } |
79 | sheet->copySheetData(¤tSheet->data); | 93 | sheet->copySheetData(¤tSheet->data); |
80 | stream.writeRawBytes("SQT100", 6); | 94 | stream.writeRawBytes("SQT100", 6); |
81 | stream << (Q_UINT32)listSheets.count(); | 95 | stream << (Q_UINT32)listSheets.count(); |
82 | for (typeSheet *tempSheet=listSheets.first(); tempSheet; tempSheet=listSheets.next()) | 96 | for (typeSheet *tempSheet=listSheets.first(); tempSheet; tempSheet=listSheets.next()) |
83 | { | 97 | { |
84 | stream << tempSheet->name << (Q_UINT32)tempSheet->data.count(); | 98 | stream << tempSheet->name << (Q_UINT32)tempSheet->data.count(); |
85 | for (typeCellData *tempCell=tempSheet->data.first(); tempCell; tempCell=tempSheet->data.next()) | 99 | for (typeCellData *tempCell=tempSheet->data.first(); tempCell; tempCell=tempSheet->data.next()) |
86 | stream << (Q_UINT32)tempCell->col << (Q_UINT32)tempCell->row << tempCell->borders.right << tempCell->borders.bottom << tempCell->background << (Q_UINT32)tempCell->alignment << tempCell->fontColor << tempCell->font << tempCell->data; | 100 | stream << (Q_UINT32)tempCell->col << (Q_UINT32)tempCell->row << tempCell->borders.right << tempCell->borders.bottom << tempCell->background << (Q_UINT32)tempCell->alignment << tempCell->fontColor << tempCell->font << tempCell->data; |
87 | } | 101 | } |
88 | 102 | ||
89 | lnkDoc.setType("application/sheet-qt"); | 103 | lnkDoc.setType("application/sheet-qt"); |
90 | if (!fm.saveFile(lnkDoc, streamBuffer)) | 104 | if (!fm.saveFile(lnkDoc, streamBuffer)) |
91 | { | 105 | { |
92 | QMessageBox::critical(this, tr("Error"), tr("File cannot be saved!")); | 106 | QMessageBox::critical(this, tr("Error"), tr("File cannot be saved!")); |
93 | return; | 107 | return; |
94 | } | 108 | } |
95 | documentModified=FALSE; | 109 | documentModified=FALSE; |
96 | } | 110 | } |
97 | 111 | ||
98 | void MainWindow::documentOpen(const DocLnk &lnkDoc) | 112 | void MainWindow::documentOpen(const DocLnk &lnkDoc) |
99 | { | 113 | { |
100 | FileManager fm; | 114 | FileManager fm; |
101 | QByteArray streamBuffer; | 115 | QByteArray streamBuffer; |
102 | if (!lnkDoc.isValid() || !fm.loadFile(lnkDoc, streamBuffer)) | 116 | if (!lnkDoc.isValid() || !fm.loadFile(lnkDoc, streamBuffer)) |
103 | { | 117 | { |
104 | QMessageBox::critical(this, tr("Error"), tr("File cannot be opened!")); | 118 | QMessageBox::critical(this, tr("Error"), tr("File cannot be opened!")); |
105 | documentModified=FALSE; | 119 | documentModified=FALSE; |
106 | selectorFileNew(DocLnk()); | 120 | selectorFileNew(DocLnk()); |
107 | return; | 121 | return; |
108 | } | 122 | } |
109 | QDataStream stream(streamBuffer, IO_ReadOnly); | 123 | QDataStream stream(streamBuffer, IO_ReadOnly); |
110 | 124 | ||
111 | Q_UINT32 countSheet, countCell, i, j, row, col, alignment; | 125 | Q_UINT32 countSheet, countCell, i, j, row, col, alignment; |
112 | typeSheet *newSheet; | 126 | typeSheet *newSheet; |
113 | typeCellData *newCell; | 127 | typeCellData *newCell; |
114 | 128 | ||
115 | char fileFormat[7]; | 129 | char fileFormat[7]; |
116 | stream.readRawBytes(fileFormat, 6); | 130 | stream.readRawBytes(fileFormat, 6); |
117 | fileFormat[6]=0; | 131 | fileFormat[6]=0; |
118 | if ((QString)fileFormat!="SQT100") | 132 | if ((QString)fileFormat!="SQT100") |
119 | { | 133 | { |
120 | QMessageBox::critical(this, tr("Error"), tr("Invalid file format!")); | 134 | QMessageBox::critical(this, tr("Error"), tr("Invalid file format!")); |
121 | documentModified=FALSE; | 135 | documentModified=FALSE; |
122 | selectorFileNew(DocLnk()); | 136 | selectorFileNew(DocLnk()); |
123 | return; | 137 | return; |
124 | } | 138 | } |
125 | 139 | ||
126 | stream >> countSheet; | 140 | stream >> countSheet; |
127 | for (i=0; i<countSheet; ++i) | 141 | for (i=0; i<countSheet; ++i) |
128 | { | 142 | { |
diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h index ac90504..554e6f6 100644 --- a/noncore/apps/opie-sheet/mainwindow.h +++ b/noncore/apps/opie-sheet/mainwindow.h | |||
@@ -1,120 +1,134 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #ifndef MAINWINDOW_H | 15 | #ifndef MAINWINDOW_H |
2 | #define MAINWINDOW_H | 16 | #define MAINWINDOW_H |
3 | 17 | ||
4 | #include <qpe/applnk.h> | 18 | #include <qpe/applnk.h> |
5 | #include <qpe/fileselector.h> | 19 | #include <qpe/fileselector.h> |
6 | #include <qpe/qpemenubar.h> | 20 | #include <qpe/qpemenubar.h> |
7 | #include <qpe/qpetoolbar.h> | 21 | #include <qpe/qpetoolbar.h> |
8 | #include <qmainwindow.h> | 22 | #include <qmainwindow.h> |
9 | #include <qaction.h> | 23 | #include <qaction.h> |
10 | #include <qlineedit.h> | 24 | #include <qlineedit.h> |
11 | #include <qbutton.h> | 25 | #include <qbutton.h> |
12 | #include <qcombobox.h> | 26 | #include <qcombobox.h> |
13 | #include <qtoolbutton.h> | 27 | #include <qtoolbutton.h> |
14 | 28 | ||
15 | #include "sheet.h" | 29 | #include "sheet.h" |
16 | 30 | ||
17 | typedef struct typeSheet | 31 | typedef struct typeSheet |
18 | { | 32 | { |
19 | QString name; | 33 | QString name; |
20 | QList<typeCellData> data; | 34 | QList<typeCellData> data; |
21 | }; | 35 | }; |
22 | 36 | ||
23 | class MainWindow: public QMainWindow | 37 | class MainWindow: public QMainWindow |
24 | { | 38 | { |
25 | Q_OBJECT | 39 | Q_OBJECT |
26 | 40 | ||
27 | // QPE objects | 41 | // QPE objects |
28 | DocLnk currentDoc; | 42 | DocLnk currentDoc; |
29 | QPEMenuBar *menu; | 43 | QPEMenuBar *menu; |
30 | QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard; | 44 | QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard; |
31 | FileSelector *fileSelector; | 45 | FileSelector *fileSelector; |
32 | 46 | ||
33 | // QT objects | 47 | // QT objects |
34 | QPopupMenu *menuFile, *menuEdit, *menuInsert, *menuFormat, *menuData, *menuHelp, | 48 | QPopupMenu *menuFile, *menuEdit, *menuInsert, *menuFormat, *menuData, *menuHelp, |
35 | *submenuFunc, *submenuFuncStd, *submenuFuncMath, *submenuFuncStat, | 49 | *submenuFunc, *submenuFuncStd, *submenuFuncMath, *submenuFuncStat, |
36 | *submenuRow, *submenuCol, *submenuSheet; | 50 | *submenuRow, *submenuCol, *submenuSheet; |
37 | QAction *fileNew, *fileOpen, *fileSave, *fileSaveAs, *fileQuit, *helpAbout, *editAccept, *editCancel, *formatCells, | 51 | QAction *fileNew, *fileOpen, *fileSave, *fileSaveAs, *fileQuit, *helpAbout, *editAccept, *editCancel, *formatCells, |
38 | *funcPlus, *funcMinus, *funcCross, *funcDivide, *funcParanOpen, *funcParanClose, *funcComma, *funcEqual, | 52 | *funcPlus, *funcMinus, *funcCross, *funcDivide, *funcParanOpen, *funcParanClose, *funcComma, *funcEqual, |
39 | *editCut, *editCopy, *editPaste, *editPasteContents, *editClear, *insertCols, *insertRows, *insertSheets, *insertCells, | 53 | *editCut, *editCopy, *editPaste, *editPasteContents, *editClear, *insertCols, *insertRows, *insertSheets, *insertCells, |
40 | *rowHeight, *rowShow, *rowHide, *rowAdjust, *colWidth, *colShow, *colHide, *colAdjust, *sheetRename, *sheetRemove, | 54 | *rowHeight, *rowShow, *rowHide, *rowAdjust, *colWidth, *colShow, *colHide, *colAdjust, *sheetRename, *sheetRemove, |
41 | *dataSort, *dataFindReplace, *editCellSelect, *helpGeneral; | 55 | *dataSort, *dataFindReplace, *editCellSelect, *helpGeneral; |
42 | QLineEdit *editData; | 56 | QLineEdit *editData; |
43 | QButton *buttonUp, *buttonDown, *buttonLeft, *buttonRight; | 57 | QButton *buttonUp, *buttonDown, *buttonLeft, *buttonRight; |
44 | QComboBox *comboSheets; | 58 | QComboBox *comboSheets; |
45 | QToolButton *toolFunction; | 59 | QToolButton *toolFunction; |
46 | QList<typeSheet> listSheets; | 60 | QList<typeSheet> listSheets; |
47 | QString helpFile; | 61 | QString helpFile; |
48 | 62 | ||
49 | // Other objects | 63 | // Other objects |
50 | Sheet *sheet; | 64 | Sheet *sheet; |
51 | 65 | ||
52 | // Variables | 66 | // Variables |
53 | bool documentModified; | 67 | bool documentModified; |
54 | 68 | ||
55 | // Private functions | 69 | // Private functions |
56 | void initMenu(); | 70 | void initMenu(); |
57 | void initActions(); | 71 | void initActions(); |
58 | void initFunctionsToolbar(); | 72 | void initFunctionsToolbar(); |
59 | void initEditToolbar(); | 73 | void initEditToolbar(); |
60 | void initStandardToolbar(); | 74 | void initStandardToolbar(); |
61 | void initSheet(); | 75 | void initSheet(); |
62 | void addToData(const QString &data); | 76 | void addToData(const QString &data); |
63 | int saveCurrentFile(bool ask=TRUE); | 77 | int saveCurrentFile(bool ask=TRUE); |
64 | void documentOpen(const DocLnk &lnkDoc); | 78 | void documentOpen(const DocLnk &lnkDoc); |
65 | void copyDocLnk(const DocLnk &source, DocLnk &target); | 79 | void copyDocLnk(const DocLnk &source, DocLnk &target); |
66 | void documentSave(DocLnk &lnkDoc); | 80 | void documentSave(DocLnk &lnkDoc); |
67 | void closeEvent(QCloseEvent *e); | 81 | void closeEvent(QCloseEvent *e); |
68 | void addFlyAction(const QString &text, const QString &menuText, const QString &tip, QWidget *w); | 82 | void addFlyAction(const QString &text, const QString &menuText, const QString &tip, QWidget *w); |
69 | typeSheet *createNewSheet(); | 83 | typeSheet *createNewSheet(); |
70 | typeSheet *findSheet(const QString &name); | 84 | typeSheet *findSheet(const QString &name); |
71 | 85 | ||
72 | private slots: | 86 | private slots: |
73 | void slotFileNew(); | 87 | void slotFileNew(); |
74 | void slotFileOpen(); | 88 | void slotFileOpen(); |
75 | void slotFileSave(); | 89 | void slotFileSave(); |
76 | void slotFileSaveAs(); | 90 | void slotFileSaveAs(); |
77 | void slotHelpAbout(); | 91 | void slotHelpAbout(); |
78 | void slotHelpGeneral(); | 92 | void slotHelpGeneral(); |
79 | void slotEditAccept(); | 93 | void slotEditAccept(); |
80 | void slotEditCancel(); | 94 | void slotEditCancel(); |
81 | void slotEditPaste(); | 95 | void slotEditPaste(); |
82 | void slotEditPasteContents(); | 96 | void slotEditPasteContents(); |
83 | void slotFormatCells(); | 97 | void slotFormatCells(); |
84 | void slotInsertCells(); | 98 | void slotInsertCells(); |
85 | void slotInsertRows(); | 99 | void slotInsertRows(); |
86 | void slotInsertCols(); | 100 | void slotInsertCols(); |
87 | void slotInsertSheets(); | 101 | void slotInsertSheets(); |
88 | void slotDataSort(); | 102 | void slotDataSort(); |
89 | void slotDataFindReplace(); | 103 | void slotDataFindReplace(); |
90 | void slotRowHeight(); | 104 | void slotRowHeight(); |
91 | void slotRowAdjust(); | 105 | void slotRowAdjust(); |
92 | void slotRowShow(); | 106 | void slotRowShow(); |
93 | void slotRowHide(); | 107 | void slotRowHide(); |
94 | void slotColumnWidth(); | 108 | void slotColumnWidth(); |
95 | void slotColumnAdjust(); | 109 | void slotColumnAdjust(); |
96 | void slotColumnShow(); | 110 | void slotColumnShow(); |
97 | void slotColumnHide(); | 111 | void slotColumnHide(); |
98 | void slotSheetRename(); | 112 | void slotSheetRename(); |
99 | void slotSheetRemove(); | 113 | void slotSheetRemove(); |
100 | void slotFuncOutput(); | 114 | void slotFuncOutput(); |
101 | void slotCellSelect(bool lock); | 115 | void slotCellSelect(bool lock); |
102 | void slotCellClicked(const QString &cell); | 116 | void slotCellClicked(const QString &cell); |
103 | void slotSheetChanged(const QString &name); | 117 | void slotSheetChanged(const QString &name); |
104 | void slotDocModified(); | 118 | void slotDocModified(); |
105 | void selectorShow(); | 119 | void selectorShow(); |
106 | void selectorHide(); | 120 | void selectorHide(); |
107 | void selectorFileNew(const DocLnk &lnkDoc); | 121 | void selectorFileNew(const DocLnk &lnkDoc); |
108 | void selectorFileOpen(const DocLnk &lnkDoc); | 122 | void selectorFileOpen(const DocLnk &lnkDoc); |
109 | 123 | ||
110 | public: | 124 | public: |
111 | MainWindow(); | 125 | MainWindow(); |
112 | ~MainWindow(); | 126 | ~MainWindow(); |
113 | 127 | ||
114 | void setHelpFile(const QString &help_filename) { helpFile=help_filename; } | 128 | void setHelpFile(const QString &help_filename) { helpFile=help_filename; } |
115 | 129 | ||
116 | public slots: | 130 | public slots: |
117 | void setDocument(const QString &applnk_filename); | 131 | void setDocument(const QString &applnk_filename); |
118 | }; | 132 | }; |
119 | 133 | ||
120 | #endif | 134 | #endif |
diff --git a/noncore/apps/opie-sheet/numberdlg.cpp b/noncore/apps/opie-sheet/numberdlg.cpp index de84378..e8de639 100644 --- a/noncore/apps/opie-sheet/numberdlg.cpp +++ b/noncore/apps/opie-sheet/numberdlg.cpp | |||
@@ -1,35 +1,49 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #include "numberdlg.h" | 15 | #include "numberdlg.h" |
2 | 16 | ||
3 | NumberDialog::NumberDialog(QWidget *parent=0) | 17 | NumberDialog::NumberDialog(QWidget *parent=0) |
4 | :QDialog(parent, 0, TRUE) | 18 | :QDialog(parent, 0, TRUE) |
5 | { | 19 | { |
6 | edit=new QSpinBox(this); | 20 | edit=new QSpinBox(this); |
7 | edit->setGeometry(120, 10, 70, 25); | 21 | edit->setGeometry(120, 10, 70, 25); |
8 | 22 | ||
9 | label=new QLabel(this); | 23 | label=new QLabel(this); |
10 | label->setGeometry(10, 10, 100, 25); | 24 | label->setGeometry(10, 10, 100, 25); |
11 | label->setBuddy(edit); | 25 | label->setBuddy(edit); |
12 | 26 | ||
13 | resize(200, 45); | 27 | resize(200, 45); |
14 | } | 28 | } |
15 | 29 | ||
16 | NumberDialog::~NumberDialog() | 30 | NumberDialog::~NumberDialog() |
17 | { | 31 | { |
18 | } | 32 | } |
19 | 33 | ||
20 | int NumberDialog::exec(const QString &caption, const QString &text, int value=1, int min=1, int max=99, int step=1) | 34 | int NumberDialog::exec(const QString &caption, const QString &text, int value=1, int min=1, int max=99, int step=1) |
21 | { | 35 | { |
22 | setCaption(caption); | 36 | setCaption(caption); |
23 | label->setText(text); | 37 | label->setText(text); |
24 | edit->setValue(value); | 38 | edit->setValue(value); |
25 | edit->setMinValue(min); | 39 | edit->setMinValue(min); |
26 | edit->setMaxValue(max); | 40 | edit->setMaxValue(max); |
27 | edit->setLineStep(step); | 41 | edit->setLineStep(step); |
28 | 42 | ||
29 | return QDialog::exec(); | 43 | return QDialog::exec(); |
30 | } | 44 | } |
31 | 45 | ||
32 | int NumberDialog::getValue() | 46 | int NumberDialog::getValue() |
33 | { | 47 | { |
34 | return edit->value(); | 48 | return edit->value(); |
35 | } | 49 | } |
diff --git a/noncore/apps/opie-sheet/numberdlg.h b/noncore/apps/opie-sheet/numberdlg.h index 46af1d0..81e3326 100644 --- a/noncore/apps/opie-sheet/numberdlg.h +++ b/noncore/apps/opie-sheet/numberdlg.h | |||
@@ -1,24 +1,38 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #ifndef NUMBERDLG_H | 15 | #ifndef NUMBERDLG_H |
2 | #define NUMBERDLG_H | 16 | #define NUMBERDLG_H |
3 | 17 | ||
4 | #include <qdialog.h> | 18 | #include <qdialog.h> |
5 | #include <qlabel.h> | 19 | #include <qlabel.h> |
6 | #include <qspinbox.h> | 20 | #include <qspinbox.h> |
7 | 21 | ||
8 | class NumberDialog: public QDialog | 22 | class NumberDialog: public QDialog |
9 | { | 23 | { |
10 | Q_OBJECT | 24 | Q_OBJECT |
11 | 25 | ||
12 | // QT objects | 26 | // QT objects |
13 | QLabel *label; | 27 | QLabel *label; |
14 | QSpinBox *edit; | 28 | QSpinBox *edit; |
15 | 29 | ||
16 | public: | 30 | public: |
17 | NumberDialog(QWidget *parent=0); | 31 | NumberDialog(QWidget *parent=0); |
18 | ~NumberDialog(); | 32 | ~NumberDialog(); |
19 | 33 | ||
20 | int exec(const QString &caption, const QString &text, int value=1, int min=1, int max=99, int step=1); | 34 | int exec(const QString &caption, const QString &text, int value=1, int min=1, int max=99, int step=1); |
21 | int getValue(); | 35 | int getValue(); |
22 | }; | 36 | }; |
23 | 37 | ||
24 | #endif | 38 | #endif |
diff --git a/noncore/apps/opie-sheet/sheet.cpp b/noncore/apps/opie-sheet/sheet.cpp index 9526937..1d7ec6f 100644 --- a/noncore/apps/opie-sheet/sheet.cpp +++ b/noncore/apps/opie-sheet/sheet.cpp | |||
@@ -1,128 +1,142 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #include "sheet.h" | 15 | #include "sheet.h" |
2 | 16 | ||
3 | #include <qmainwindow.h> | 17 | #include <qmainwindow.h> |
4 | #include <qmessagebox.h> | 18 | #include <qmessagebox.h> |
5 | #include <math.h> | 19 | #include <math.h> |
6 | 20 | ||
7 | #define DEFAULT_COL_WIDTH 50 | 21 | #define DEFAULT_COL_WIDTH 50 |
8 | 22 | ||
9 | Sheet::Sheet(int numRows, int numCols, QWidget *parent) | 23 | Sheet::Sheet(int numRows, int numCols, QWidget *parent) |
10 | :QTable(numRows, numCols, parent) | 24 | :QTable(numRows, numCols, parent) |
11 | { | 25 | { |
12 | defaultBorders.right=defaultBorders.bottom=QPen(Qt::gray, 1, Qt::SolidLine); | 26 | defaultBorders.right=defaultBorders.bottom=QPen(Qt::gray, 1, Qt::SolidLine); |
13 | defaultCellData.data=""; | 27 | defaultCellData.data=""; |
14 | defaultCellData.background=QBrush(Qt::white, Qt::SolidPattern); | 28 | defaultCellData.background=QBrush(Qt::white, Qt::SolidPattern); |
15 | defaultCellData.alignment=(Qt::AlignmentFlags)(Qt::AlignLeft | Qt::AlignTop); | 29 | defaultCellData.alignment=(Qt::AlignmentFlags)(Qt::AlignLeft | Qt::AlignTop); |
16 | defaultCellData.fontColor=Qt::black; | 30 | defaultCellData.fontColor=Qt::black; |
17 | defaultCellData.font=font(); | 31 | defaultCellData.font=font(); |
18 | defaultCellData.borders=defaultBorders; | 32 | defaultCellData.borders=defaultBorders; |
19 | 33 | ||
20 | selectionNo=-1; | 34 | selectionNo=-1; |
21 | setSelectionMode(QTable::Single); | 35 | setSelectionMode(QTable::Single); |
22 | 36 | ||
23 | sheetData.setAutoDelete(TRUE); | 37 | sheetData.setAutoDelete(TRUE); |
24 | clipboardData.setAutoDelete(TRUE); | 38 | clipboardData.setAutoDelete(TRUE); |
25 | for (int i=0; i<numCols; ++i) | 39 | for (int i=0; i<numCols; ++i) |
26 | horizontalHeader()->setLabel(i, getHeaderString(i+1), DEFAULT_COL_WIDTH); | 40 | horizontalHeader()->setLabel(i, getHeaderString(i+1), DEFAULT_COL_WIDTH); |
27 | 41 | ||
28 | connect(this, SIGNAL(currentChanged(int, int)), this, SLOT(slotCellSelected(int, int))); | 42 | connect(this, SIGNAL(currentChanged(int, int)), this, SLOT(slotCellSelected(int, int))); |
29 | connect(this, SIGNAL(valueChanged(int, int)), this, SLOT(slotCellChanged(int, int))); | 43 | connect(this, SIGNAL(valueChanged(int, int)), this, SLOT(slotCellChanged(int, int))); |
30 | } | 44 | } |
31 | 45 | ||
32 | Sheet::~Sheet() | 46 | Sheet::~Sheet() |
33 | { | 47 | { |
34 | } | 48 | } |
35 | 49 | ||
36 | typeCellData *Sheet::findCellData(int row, int col) | 50 | typeCellData *Sheet::findCellData(int row, int col) |
37 | { | 51 | { |
38 | typeCellData *tempCellData; | 52 | typeCellData *tempCellData; |
39 | for (tempCellData=sheetData.first(); tempCellData; tempCellData=sheetData.next()) | 53 | for (tempCellData=sheetData.first(); tempCellData; tempCellData=sheetData.next()) |
40 | if (tempCellData->row==row && tempCellData->col==col) | 54 | if (tempCellData->row==row && tempCellData->col==col) |
41 | return tempCellData; | 55 | return tempCellData; |
42 | return NULL; | 56 | return NULL; |
43 | } | 57 | } |
44 | 58 | ||
45 | void Sheet::slotCellSelected(int row, int col) | 59 | void Sheet::slotCellSelected(int row, int col) |
46 | { | 60 | { |
47 | typeCellData *cellData=findCellData(row, col); | 61 | typeCellData *cellData=findCellData(row, col); |
48 | if (cellData) | 62 | if (cellData) |
49 | emit currentDataChanged(cellData->data); | 63 | emit currentDataChanged(cellData->data); |
50 | else | 64 | else |
51 | emit currentDataChanged(""); | 65 | emit currentDataChanged(""); |
52 | } | 66 | } |
53 | 67 | ||
54 | typeCellData *Sheet::createCellData(int row, int col) | 68 | typeCellData *Sheet::createCellData(int row, int col) |
55 | { | 69 | { |
56 | if (row<0 || col<0) return NULL; | 70 | if (row<0 || col<0) return NULL; |
57 | typeCellData *cellData=new typeCellData; | 71 | typeCellData *cellData=new typeCellData; |
58 | cellData->row=row; | 72 | cellData->row=row; |
59 | cellData->col=col; | 73 | cellData->col=col; |
60 | cellData->data=defaultCellData.data; | 74 | cellData->data=defaultCellData.data; |
61 | cellData->borders=defaultCellData.borders; | 75 | cellData->borders=defaultCellData.borders; |
62 | cellData->alignment=defaultCellData.alignment; | 76 | cellData->alignment=defaultCellData.alignment; |
63 | cellData->font=defaultCellData.font; | 77 | cellData->font=defaultCellData.font; |
64 | cellData->fontColor=defaultCellData.fontColor; | 78 | cellData->fontColor=defaultCellData.fontColor; |
65 | cellData->background=defaultCellData.background; | 79 | cellData->background=defaultCellData.background; |
66 | sheetData.append(cellData); | 80 | sheetData.append(cellData); |
67 | return cellData; | 81 | return cellData; |
68 | } | 82 | } |
69 | 83 | ||
70 | void Sheet::slotCellChanged(int row, int col) | 84 | void Sheet::slotCellChanged(int row, int col) |
71 | { | 85 | { |
72 | typeCellData *cellData=findCellData(row, col); | 86 | typeCellData *cellData=findCellData(row, col); |
73 | if (!cellData) cellData=createCellData(row, col); | 87 | if (!cellData) cellData=createCellData(row, col); |
74 | if (cellData) cellData->data=text(row, col); | 88 | if (cellData) cellData->data=text(row, col); |
75 | for (cellData=sheetData.first(); cellData; cellData=sheetData.next()) | 89 | for (cellData=sheetData.first(); cellData; cellData=sheetData.next()) |
76 | setText(cellData->row, cellData->col, dataParser(cellData->data)); | 90 | setText(cellData->row, cellData->col, dataParser(cellData->data)); |
77 | emit sheetModified(); | 91 | emit sheetModified(); |
78 | } | 92 | } |
79 | 93 | ||
80 | void Sheet::swapCells(int row1, int col1, int row2, int col2) | 94 | void Sheet::swapCells(int row1, int col1, int row2, int col2) |
81 | { | 95 | { |
82 | typeCellData *cellData1=findCellData(row1, col1), *cellData2=findCellData(row2, col2); | 96 | typeCellData *cellData1=findCellData(row1, col1), *cellData2=findCellData(row2, col2); |
83 | if (!cellData1) cellData1=createCellData(row1, col1); | 97 | if (!cellData1) cellData1=createCellData(row1, col1); |
84 | if (!cellData2) cellData2=createCellData(row2, col2); | 98 | if (!cellData2) cellData2=createCellData(row2, col2); |
85 | if (cellData1 && cellData2) | 99 | if (cellData1 && cellData2) |
86 | { | 100 | { |
87 | QString tempData(cellData1->data); | 101 | QString tempData(cellData1->data); |
88 | cellData1->data=cellData2->data; | 102 | cellData1->data=cellData2->data; |
89 | cellData2->data=tempData; | 103 | cellData2->data=tempData; |
90 | setText(cellData1->row, cellData1->col, dataParser(cellData1->data)); | 104 | setText(cellData1->row, cellData1->col, dataParser(cellData1->data)); |
91 | setText(cellData2->row, cellData2->col, dataParser(cellData2->data)); | 105 | setText(cellData2->row, cellData2->col, dataParser(cellData2->data)); |
92 | emit sheetModified(); | 106 | emit sheetModified(); |
93 | } | 107 | } |
94 | } | 108 | } |
95 | 109 | ||
96 | QString Sheet::getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName="") | 110 | QString Sheet::getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName="") |
97 | { | 111 | { |
98 | QString params(parameters); | 112 | QString params(parameters); |
99 | int position; | 113 | int position; |
100 | for (int i=0; i<paramNo; ++i) | 114 | for (int i=0; i<paramNo; ++i) |
101 | { | 115 | { |
102 | position=params.find(','); | 116 | position=params.find(','); |
103 | if (position<0) | 117 | if (position<0) |
104 | { | 118 | { |
105 | if (giveError) QMessageBox::critical(this, tr("Error"), tr("Too few arguments to function '"+funcName+'\'')); | 119 | if (giveError) QMessageBox::critical(this, tr("Error"), tr("Too few arguments to function '"+funcName+'\'')); |
106 | return QString(); | 120 | return QString(); |
107 | } | 121 | } |
108 | params=params.mid(position+1); | 122 | params=params.mid(position+1); |
109 | } | 123 | } |
110 | position=params.find(','); | 124 | position=params.find(','); |
111 | if (position<0) return params; | 125 | if (position<0) return params; |
112 | return params.left(position); | 126 | return params.left(position); |
113 | } | 127 | } |
114 | 128 | ||
115 | bool Sheet::findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2) | 129 | bool Sheet::findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2) |
116 | { | 130 | { |
117 | int row, col; | 131 | int row, col; |
118 | if (!findRowColumn(variable1, row1, col1, TRUE) || !findRowColumn(variable2, row2, col2, TRUE)) return FALSE; | 132 | if (!findRowColumn(variable1, row1, col1, TRUE) || !findRowColumn(variable2, row2, col2, TRUE)) return FALSE; |
119 | if (*row1>*row2) | 133 | if (*row1>*row2) |
120 | { | 134 | { |
121 | row=*row1; | 135 | row=*row1; |
122 | *row1=*row2; | 136 | *row1=*row2; |
123 | *row2=row; | 137 | *row2=row; |
124 | } | 138 | } |
125 | if (*col1>*col2) | 139 | if (*col1>*col2) |
126 | { | 140 | { |
127 | col=*col1; | 141 | col=*col1; |
128 | *col1=*col2; | 142 | *col1=*col2; |
diff --git a/noncore/apps/opie-sheet/sheet.h b/noncore/apps/opie-sheet/sheet.h index 02899a0..f78a684 100644 --- a/noncore/apps/opie-sheet/sheet.h +++ b/noncore/apps/opie-sheet/sheet.h | |||
@@ -1,120 +1,134 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #ifndef SHEET_H | 15 | #ifndef SHEET_H |
2 | #define SHEET_H | 16 | #define SHEET_H |
3 | 17 | ||
4 | #include <qtable.h> | 18 | #include <qtable.h> |
5 | #include <qstack.h> | 19 | #include <qstack.h> |
6 | 20 | ||
7 | typedef struct typeCellBorders | 21 | typedef struct typeCellBorders |
8 | { | 22 | { |
9 | QPen right, bottom; | 23 | QPen right, bottom; |
10 | }; | 24 | }; |
11 | 25 | ||
12 | typedef struct typeCellData | 26 | typedef struct typeCellData |
13 | { | 27 | { |
14 | int col, row; | 28 | int col, row; |
15 | typeCellBorders borders; | 29 | typeCellBorders borders; |
16 | QBrush background; | 30 | QBrush background; |
17 | Qt::AlignmentFlags alignment; | 31 | Qt::AlignmentFlags alignment; |
18 | QColor fontColor; | 32 | QColor fontColor; |
19 | QFont font; | 33 | QFont font; |
20 | QString data; | 34 | QString data; |
21 | }; | 35 | }; |
22 | 36 | ||
23 | class Sheet: public QTable | 37 | class Sheet: public QTable |
24 | { | 38 | { |
25 | Q_OBJECT | 39 | Q_OBJECT |
26 | 40 | ||
27 | // Variables | 41 | // Variables |
28 | bool clicksLocked; | 42 | bool clicksLocked; |
29 | int selectionNo; | 43 | int selectionNo; |
30 | typeCellBorders defaultBorders; | 44 | typeCellBorders defaultBorders; |
31 | typeCellData defaultCellData; | 45 | typeCellData defaultCellData; |
32 | 46 | ||
33 | // QT objects | 47 | // QT objects |
34 | QList<typeCellData> sheetData, clipboardData; | 48 | QList<typeCellData> sheetData, clipboardData; |
35 | QString pressedCell, releasedCell, sheetName; | 49 | QString pressedCell, releasedCell, sheetName; |
36 | 50 | ||
37 | // Private functions | 51 | // Private functions |
38 | int getOperatorPriority(char oper); | 52 | int getOperatorPriority(char oper); |
39 | bool findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE); | 53 | bool findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE); |
40 | bool findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2); | 54 | bool findRange(const QString &variable1, const QString &variable2, int *row1, int *col1, int *row2, int *col2); |
41 | double calculateVariable(const QString &variable); | 55 | double calculateVariable(const QString &variable); |
42 | double calculateFunction(const QString &function, const QString ¶meters); | 56 | double calculateFunction(const QString &function, const QString ¶meters); |
43 | QChar popCharStack(QStack<QChar> *stackChars); | 57 | QChar popCharStack(QStack<QChar> *stackChars); |
44 | QString popStringStack(QStack<QString> *stackStrings); | 58 | QString popStringStack(QStack<QString> *stackStrings); |
45 | QString getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName=""); | 59 | QString getParameter(const QString ¶meters, int paramNo, bool giveError=FALSE, const QString funcName=""); |
46 | QString dataParser(const QString &data); | 60 | QString dataParser(const QString &data); |
47 | QString dataParserHelper(const QString &data); | 61 | QString dataParserHelper(const QString &data); |
48 | typeCellData *createCellData(int row, int col); | 62 | typeCellData *createCellData(int row, int col); |
49 | typeCellData *findCellData(int row, int col); | 63 | typeCellData *findCellData(int row, int col); |
50 | void pushCharStack(QStack<QChar> *stackChars, const QChar &character); | 64 | void pushCharStack(QStack<QChar> *stackChars, const QChar &character); |
51 | void pushStringStack(QStack<QString> *stackStrings, const QString &string); | 65 | void pushStringStack(QStack<QString> *stackStrings, const QString &string); |
52 | 66 | ||
53 | // Sheet/Qt parser functions | 67 | // Sheet/Qt parser functions |
54 | double functionSum(const QString ¶m1, const QString ¶m2); | 68 | double functionSum(const QString ¶m1, const QString ¶m2); |
55 | double functionAvg(const QString ¶m1, const QString ¶m2); | 69 | double functionAvg(const QString ¶m1, const QString ¶m2); |
56 | double functionMax(const QString ¶m1, const QString ¶m2); | 70 | double functionMax(const QString ¶m1, const QString ¶m2); |
57 | double functionMin(const QString ¶m1, const QString ¶m2); | 71 | double functionMin(const QString ¶m1, const QString ¶m2); |
58 | double functionCount(const QString ¶m1, const QString ¶m2); | 72 | double functionCount(const QString ¶m1, const QString ¶m2); |
59 | 73 | ||
60 | // Reimplemented QTable functions | 74 | // Reimplemented QTable functions |
61 | void paintCell(QPainter *p, int row, int col, const QRect & cr, bool selected); | 75 | void paintCell(QPainter *p, int row, int col, const QRect & cr, bool selected); |
62 | void viewportMousePressEvent(QMouseEvent *e); | 76 | void viewportMousePressEvent(QMouseEvent *e); |
63 | void viewportMouseMoveEvent(QMouseEvent *e); | 77 | void viewportMouseMoveEvent(QMouseEvent *e); |
64 | void viewportMouseReleaseEvent(QMouseEvent *e); | 78 | void viewportMouseReleaseEvent(QMouseEvent *e); |
65 | 79 | ||
66 | private slots: | 80 | private slots: |
67 | void slotCellSelected(int row, int col); | 81 | void slotCellSelected(int row, int col); |
68 | void slotCellChanged(int row, int col); | 82 | void slotCellChanged(int row, int col); |
69 | 83 | ||
70 | public: | 84 | public: |
71 | Sheet(int numRows, int numCols, QWidget *parent); | 85 | Sheet(int numRows, int numCols, QWidget *parent); |
72 | ~Sheet(); | 86 | ~Sheet(); |
73 | 87 | ||
74 | void setData(const QString &data); | 88 | void setData(const QString &data); |
75 | QString getData(); | 89 | QString getData(); |
76 | 90 | ||
77 | void setName(const QString &data); | 91 | void setName(const QString &data); |
78 | QString getName(); | 92 | QString getName(); |
79 | 93 | ||
80 | void setPen(int row, int col, int vertical, const QPen &pen); | 94 | void setPen(int row, int col, int vertical, const QPen &pen); |
81 | QPen getPen(int row, int col, int vertical); | 95 | QPen getPen(int row, int col, int vertical); |
82 | 96 | ||
83 | void setBrush(int row, int col, const QBrush &brush); | 97 | void setBrush(int row, int col, const QBrush &brush); |
84 | QBrush getBrush(int row, int col); | 98 | QBrush getBrush(int row, int col); |
85 | 99 | ||
86 | void setTextAlign(int row, int col, Qt::AlignmentFlags flags); | 100 | void setTextAlign(int row, int col, Qt::AlignmentFlags flags); |
87 | Qt::AlignmentFlags getAlignment(int row, int col); | 101 | Qt::AlignmentFlags getAlignment(int row, int col); |
88 | 102 | ||
89 | void setTextFont(int row, int col, const QFont &font, const QColor &color); | 103 | void setTextFont(int row, int col, const QFont &font, const QColor &color); |
90 | QFont getFont(int row, int col); | 104 | QFont getFont(int row, int col); |
91 | QColor getFontColor(int row, int col); | 105 | QColor getFontColor(int row, int col); |
92 | 106 | ||
93 | void lockClicks(bool lock=TRUE); | 107 | void lockClicks(bool lock=TRUE); |
94 | void copySheetData(QList<typeCellData> *destSheetData); | 108 | void copySheetData(QList<typeCellData> *destSheetData); |
95 | void setSheetData(QList<typeCellData> *srcSheetData); | 109 | void setSheetData(QList<typeCellData> *srcSheetData); |
96 | void getSelection(int *row1, int *col1, int *row2, int *col2); | 110 | void getSelection(int *row1, int *col1, int *row2, int *col2); |
97 | 111 | ||
98 | void insertRows(int no=1, bool allColumns=TRUE); | 112 | void insertRows(int no=1, bool allColumns=TRUE); |
99 | void insertColumns(int no=1, bool allRows=TRUE); | 113 | void insertColumns(int no=1, bool allRows=TRUE); |
100 | 114 | ||
101 | void dataFindReplace(const QString &find, const QString &replace, bool matchCase=TRUE, bool allCells=TRUE, bool entireCell=FALSE, bool replace=FALSE, bool replaceAll=FALSE); | 115 | void dataFindReplace(const QString &find, const QString &replace, bool matchCase=TRUE, bool allCells=TRUE, bool entireCell=FALSE, bool replace=FALSE, bool replaceAll=FALSE); |
102 | 116 | ||
103 | // Static functions | 117 | // Static functions |
104 | static int getHeaderColumn(const QString §ion); | 118 | static int getHeaderColumn(const QString §ion); |
105 | static QString getHeaderString(int section); | 119 | static QString getHeaderString(int section); |
106 | 120 | ||
107 | public slots: | 121 | public slots: |
108 | void editCut(); | 122 | void editCut(); |
109 | void editCopy(); | 123 | void editCopy(); |
110 | void editPaste(bool onlyContents=FALSE); | 124 | void editPaste(bool onlyContents=FALSE); |
111 | void editClear(); | 125 | void editClear(); |
112 | void swapCells(int row1, int col1, int row2, int col2); | 126 | void swapCells(int row1, int col1, int row2, int col2); |
113 | 127 | ||
114 | signals: | 128 | signals: |
115 | void currentDataChanged(const QString &data); | 129 | void currentDataChanged(const QString &data); |
116 | void cellClicked(const QString &cell); | 130 | void cellClicked(const QString &cell); |
117 | void sheetModified(); | 131 | void sheetModified(); |
118 | }; | 132 | }; |
119 | 133 | ||
120 | #endif | 134 | #endif |
diff --git a/noncore/apps/opie-sheet/sortdlg.cpp b/noncore/apps/opie-sheet/sortdlg.cpp index f46562e..4f18fd3 100644 --- a/noncore/apps/opie-sheet/sortdlg.cpp +++ b/noncore/apps/opie-sheet/sortdlg.cpp | |||
@@ -1,128 +1,142 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #include <qlabel.h> | 15 | #include <qlabel.h> |
2 | #include <qradiobutton.h> | 16 | #include <qradiobutton.h> |
3 | #include <qmessagebox.h> | 17 | #include <qmessagebox.h> |
4 | #include "sortdlg.h" | 18 | #include "sortdlg.h" |
5 | 19 | ||
6 | SortDialog::SortDialog(QWidget *parent=0) | 20 | SortDialog::SortDialog(QWidget *parent=0) |
7 | :QDialog(parent, 0, TRUE) | 21 | :QDialog(parent, 0, TRUE) |
8 | { | 22 | { |
9 | // Main widget | 23 | // Main widget |
10 | tabs=new QTabWidget(this); | 24 | tabs=new QTabWidget(this); |
11 | widgetSort=new QWidget(tabs); | 25 | widgetSort=new QWidget(tabs); |
12 | widgetOptions=new QWidget(tabs); | 26 | widgetOptions=new QWidget(tabs); |
13 | tabs->addTab(widgetSort, tr("&Sort")); | 27 | tabs->addTab(widgetSort, tr("&Sort")); |
14 | tabs->addTab(widgetOptions, tr("&Options")); | 28 | tabs->addTab(widgetOptions, tr("&Options")); |
15 | 29 | ||
16 | // Sort tab | 30 | // Sort tab |
17 | comboFieldA=createFieldCombo(tr("&Sort by"), 10); | 31 | comboFieldA=createFieldCombo(tr("&Sort by"), 10); |
18 | groupOrderA=createOrderButtons(10); | 32 | groupOrderA=createOrderButtons(10); |
19 | comboFieldB=createFieldCombo(tr("&Then by"), 90); | 33 | comboFieldB=createFieldCombo(tr("&Then by"), 90); |
20 | groupOrderB=createOrderButtons(90); | 34 | groupOrderB=createOrderButtons(90); |
21 | comboFieldC=createFieldCombo(tr("Then &by"), 170); | 35 | comboFieldC=createFieldCombo(tr("Then &by"), 170); |
22 | groupOrderC=createOrderButtons(170); | 36 | groupOrderC=createOrderButtons(170); |
23 | 37 | ||
24 | // Options tab | 38 | // Options tab |
25 | checkCase=new QCheckBox(tr("&Case Sensitive"), widgetOptions); | 39 | checkCase=new QCheckBox(tr("&Case Sensitive"), widgetOptions); |
26 | checkCase->setGeometry(10, 10, 215, 20); | 40 | checkCase->setGeometry(10, 10, 215, 20); |
27 | checkCase->setChecked(TRUE); | 41 | checkCase->setChecked(TRUE); |
28 | 42 | ||
29 | groupDirection=new QVButtonGroup(tr("&Direction"), widgetOptions); | 43 | groupDirection=new QVButtonGroup(tr("&Direction"), widgetOptions); |
30 | groupDirection->setGeometry(10, 40, 215, 70); | 44 | groupDirection->setGeometry(10, 40, 215, 70); |
31 | QRadioButton *radio=new QRadioButton(tr("&Top to bottom (rows)"), groupDirection); | 45 | QRadioButton *radio=new QRadioButton(tr("&Top to bottom (rows)"), groupDirection); |
32 | radio=new QRadioButton(tr("&Left to right (columns)"), groupDirection); | 46 | radio=new QRadioButton(tr("&Left to right (columns)"), groupDirection); |
33 | groupDirection->setButton(0); | 47 | groupDirection->setButton(0); |
34 | connect(groupDirection, SIGNAL(clicked(int)), this, SLOT(directionChanged(int))); | 48 | connect(groupDirection, SIGNAL(clicked(int)), this, SLOT(directionChanged(int))); |
35 | 49 | ||
36 | // Main widget | 50 | // Main widget |
37 | box=new QVBoxLayout(this); | 51 | box=new QVBoxLayout(this); |
38 | box->addWidget(tabs); | 52 | box->addWidget(tabs); |
39 | 53 | ||
40 | setCaption(tr("Sort")); | 54 | setCaption(tr("Sort")); |
41 | } | 55 | } |
42 | 56 | ||
43 | SortDialog::~SortDialog() | 57 | SortDialog::~SortDialog() |
44 | { | 58 | { |
45 | } | 59 | } |
46 | 60 | ||
47 | QComboBox *SortDialog::createFieldCombo(const QString &caption, int y) | 61 | QComboBox *SortDialog::createFieldCombo(const QString &caption, int y) |
48 | { | 62 | { |
49 | QLabel *label=new QLabel(caption, widgetSort); | 63 | QLabel *label=new QLabel(caption, widgetSort); |
50 | label->setGeometry(10, y+5, 215, 20); | 64 | label->setGeometry(10, y+5, 215, 20); |
51 | QComboBox *combo=new QComboBox(FALSE, widgetSort); | 65 | QComboBox *combo=new QComboBox(FALSE, widgetSort); |
52 | combo->setGeometry(10, y+35, 105, 20); | 66 | combo->setGeometry(10, y+35, 105, 20); |
53 | label->setBuddy(combo); | 67 | label->setBuddy(combo); |
54 | return combo; | 68 | return combo; |
55 | } | 69 | } |
56 | 70 | ||
57 | QVButtonGroup *SortDialog::createOrderButtons(int y) | 71 | QVButtonGroup *SortDialog::createOrderButtons(int y) |
58 | { | 72 | { |
59 | QVButtonGroup *group=new QVButtonGroup(widgetSort); | 73 | QVButtonGroup *group=new QVButtonGroup(widgetSort); |
60 | group->setGeometry(125, y, 100, 60); | 74 | group->setGeometry(125, y, 100, 60); |
61 | QRadioButton *radio=new QRadioButton(tr("&Ascending"), group); | 75 | QRadioButton *radio=new QRadioButton(tr("&Ascending"), group); |
62 | radio=new QRadioButton(tr("&Descending"), group); | 76 | radio=new QRadioButton(tr("&Descending"), group); |
63 | group->setButton(0); | 77 | group->setButton(0); |
64 | return group; | 78 | return group; |
65 | } | 79 | } |
66 | 80 | ||
67 | void SortDialog::directionChanged(int id) | 81 | void SortDialog::directionChanged(int id) |
68 | { | 82 | { |
69 | direction=id; | 83 | direction=id; |
70 | fillFieldCombo(comboFieldA); | 84 | fillFieldCombo(comboFieldA); |
71 | fillFieldCombo(comboFieldB); | 85 | fillFieldCombo(comboFieldB); |
72 | fillFieldCombo(comboFieldC); | 86 | fillFieldCombo(comboFieldC); |
73 | } | 87 | } |
74 | 88 | ||
75 | void SortDialog::fillFieldCombo(QComboBox *combo) | 89 | void SortDialog::fillFieldCombo(QComboBox *combo) |
76 | { | 90 | { |
77 | combo->clear(); | 91 | combo->clear(); |
78 | if (direction) | 92 | if (direction) |
79 | for (int row=row1; row<=row2; ++row) | 93 | for (int row=row1; row<=row2; ++row) |
80 | combo->insertItem("Row "+QString::number(row+1)); | 94 | combo->insertItem("Row "+QString::number(row+1)); |
81 | else | 95 | else |
82 | for (int col=col1; col<=col2; ++col) | 96 | for (int col=col1; col<=col2; ++col) |
83 | combo->insertItem("Column "+Sheet::getHeaderString(col+1)); | 97 | combo->insertItem("Column "+Sheet::getHeaderString(col+1)); |
84 | } | 98 | } |
85 | 99 | ||
86 | int SortDialog::exec(Sheet *s) | 100 | int SortDialog::exec(Sheet *s) |
87 | { | 101 | { |
88 | sheet=s; | 102 | sheet=s; |
89 | sheet->getSelection(&row1, &col1, &row2, &col2); | 103 | sheet->getSelection(&row1, &col1, &row2, &col2); |
90 | 104 | ||
91 | direction=0; | 105 | direction=0; |
92 | fillFieldCombo(comboFieldA); | 106 | fillFieldCombo(comboFieldA); |
93 | fillFieldCombo(comboFieldB); | 107 | fillFieldCombo(comboFieldB); |
94 | fillFieldCombo(comboFieldC); | 108 | fillFieldCombo(comboFieldC); |
95 | 109 | ||
96 | if (row1==row2 && col1==col2) | 110 | if (row1==row2 && col1==col2) |
97 | { | 111 | { |
98 | QMessageBox::warning(this, tr("Error"), tr("One cell cannot be sorted!")); | 112 | QMessageBox::warning(this, tr("Error"), tr("One cell cannot be sorted!")); |
99 | return QDialog::Rejected; | 113 | return QDialog::Rejected; |
100 | } | 114 | } |
101 | if (QDialog::exec()==QDialog::Accepted) | 115 | if (QDialog::exec()==QDialog::Accepted) |
102 | { | 116 | { |
103 | QString field1S=comboFieldA->currentText(), field2S=comboFieldA->currentText(), field3S=comboFieldA->currentText(); | 117 | QString field1S=comboFieldA->currentText(), field2S=comboFieldA->currentText(), field3S=comboFieldA->currentText(); |
104 | field1S=field1S.mid(field1S.find(' ')+1); | 118 | field1S=field1S.mid(field1S.find(' ')+1); |
105 | field2S=field2S.mid(field2S.find(' ')+1); | 119 | field2S=field2S.mid(field2S.find(' ')+1); |
106 | field3S=field3S.mid(field3S.find(' ')+1); | 120 | field3S=field3S.mid(field3S.find(' ')+1); |
107 | int field1, field2, field3; | 121 | int field1, field2, field3; |
108 | if (direction) | 122 | if (direction) |
109 | { | 123 | { |
110 | field1=field1S.toInt()-1; | 124 | field1=field1S.toInt()-1; |
111 | field2=field2S.toInt()-1; | 125 | field2=field2S.toInt()-1; |
112 | field3=field3S.toInt()-1; | 126 | field3=field3S.toInt()-1; |
113 | int i, j; | 127 | int i, j; |
114 | for (i=col2; i>=col1; --i) | 128 | for (i=col2; i>=col1; --i) |
115 | for (j=col1+1; j<=i; ++j) | 129 | for (j=col1+1; j<=i; ++j) |
116 | { | 130 | { |
117 | bool swap=FALSE; | 131 | bool swap=FALSE; |
118 | int compareResult=compareItems(s->item(field1, j-1), s->item(field1, j), groupOrderA->id(groupOrderA->selected()), checkCase->isChecked()); | 132 | int compareResult=compareItems(s->item(field1, j-1), s->item(field1, j), groupOrderA->id(groupOrderA->selected()), checkCase->isChecked()); |
119 | if (compareResult>0) swap=TRUE; | 133 | if (compareResult>0) swap=TRUE; |
120 | else if (compareResult==0) | 134 | else if (compareResult==0) |
121 | { | 135 | { |
122 | compareResult=compareItems(s->item(field2, j-1), s->item(field2, j), groupOrderA->id(groupOrderB->selected()), checkCase->isChecked()); | 136 | compareResult=compareItems(s->item(field2, j-1), s->item(field2, j), groupOrderA->id(groupOrderB->selected()), checkCase->isChecked()); |
123 | if (compareResult>0) swap=TRUE; | 137 | if (compareResult>0) swap=TRUE; |
124 | else if (compareResult==0) | 138 | else if (compareResult==0) |
125 | { | 139 | { |
126 | compareResult=compareItems(s->item(field3, j-1), s->item(field3, j), groupOrderA->id(groupOrderC->selected()), checkCase->isChecked()); | 140 | compareResult=compareItems(s->item(field3, j-1), s->item(field3, j), groupOrderA->id(groupOrderC->selected()), checkCase->isChecked()); |
127 | if (compareResult>0) swap=TRUE; | 141 | if (compareResult>0) swap=TRUE; |
128 | } | 142 | } |
diff --git a/noncore/apps/opie-sheet/sortdlg.h b/noncore/apps/opie-sheet/sortdlg.h index 2c99f02..b3699a9 100644 --- a/noncore/apps/opie-sheet/sortdlg.h +++ b/noncore/apps/opie-sheet/sortdlg.h | |||
@@ -1,45 +1,59 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #ifndef SORTDLG_H | 15 | #ifndef SORTDLG_H |
2 | #define SORTDLG_H | 16 | #define SORTDLG_H |
3 | 17 | ||
4 | #include <qdialog.h> | 18 | #include <qdialog.h> |
5 | #include <qtabwidget.h> | 19 | #include <qtabwidget.h> |
6 | #include <qlayout.h> | 20 | #include <qlayout.h> |
7 | #include <qcombobox.h> | 21 | #include <qcombobox.h> |
8 | #include <qcheckbox.h> | 22 | #include <qcheckbox.h> |
9 | #include <qpushbutton.h> | 23 | #include <qpushbutton.h> |
10 | #include <qvbuttongroup.h> | 24 | #include <qvbuttongroup.h> |
11 | #include "sheet.h" | 25 | #include "sheet.h" |
12 | 26 | ||
13 | class SortDialog: public QDialog | 27 | class SortDialog: public QDialog |
14 | { | 28 | { |
15 | Q_OBJECT | 29 | Q_OBJECT |
16 | 30 | ||
17 | // QT objects | 31 | // QT objects |
18 | QBoxLayout *box; | 32 | QBoxLayout *box; |
19 | QTabWidget *tabs; | 33 | QTabWidget *tabs; |
20 | QWidget *widgetSort, *widgetOptions; | 34 | QWidget *widgetSort, *widgetOptions; |
21 | QVButtonGroup *groupOrderA, *groupOrderB, *groupOrderC, *groupDirection; | 35 | QVButtonGroup *groupOrderA, *groupOrderB, *groupOrderC, *groupDirection; |
22 | QCheckBox *checkCase; | 36 | QCheckBox *checkCase; |
23 | QComboBox *comboFieldA, *comboFieldB, *comboFieldC; | 37 | QComboBox *comboFieldA, *comboFieldB, *comboFieldC; |
24 | 38 | ||
25 | // Other objects & variables | 39 | // Other objects & variables |
26 | int row1, col1, row2, col2, direction; | 40 | int row1, col1, row2, col2, direction; |
27 | Sheet *sheet; | 41 | Sheet *sheet; |
28 | 42 | ||
29 | // Private functions | 43 | // Private functions |
30 | QVButtonGroup *createOrderButtons(int y); | 44 | QVButtonGroup *createOrderButtons(int y); |
31 | QComboBox *createFieldCombo(const QString &caption, int y); | 45 | QComboBox *createFieldCombo(const QString &caption, int y); |
32 | void fillFieldCombo(QComboBox *combo); | 46 | void fillFieldCombo(QComboBox *combo); |
33 | int compareItems(QTableItem *item1, QTableItem *item2, int descending=0, bool caseSensitive=TRUE); | 47 | int compareItems(QTableItem *item1, QTableItem *item2, int descending=0, bool caseSensitive=TRUE); |
34 | 48 | ||
35 | private slots: | 49 | private slots: |
36 | void directionChanged(int id); | 50 | void directionChanged(int id); |
37 | 51 | ||
38 | public: | 52 | public: |
39 | SortDialog(QWidget *parent=0); | 53 | SortDialog(QWidget *parent=0); |
40 | ~SortDialog(); | 54 | ~SortDialog(); |
41 | 55 | ||
42 | int exec(Sheet *s); | 56 | int exec(Sheet *s); |
43 | }; | 57 | }; |
44 | 58 | ||
45 | #endif | 59 | #endif |
diff --git a/noncore/apps/opie-sheet/textdlg.cpp b/noncore/apps/opie-sheet/textdlg.cpp index 8245fe4..0810eb2 100644 --- a/noncore/apps/opie-sheet/textdlg.cpp +++ b/noncore/apps/opie-sheet/textdlg.cpp | |||
@@ -1,32 +1,46 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #include "textdlg.h" | 15 | #include "textdlg.h" |
2 | 16 | ||
3 | TextDialog::TextDialog(QWidget *parent=0) | 17 | TextDialog::TextDialog(QWidget *parent=0) |
4 | :QDialog(parent, 0, TRUE) | 18 | :QDialog(parent, 0, TRUE) |
5 | { | 19 | { |
6 | edit=new QLineEdit(this); | 20 | edit=new QLineEdit(this); |
7 | edit->setGeometry(90, 10, 100, 25); | 21 | edit->setGeometry(90, 10, 100, 25); |
8 | 22 | ||
9 | label=new QLabel(this); | 23 | label=new QLabel(this); |
10 | label->setGeometry(10, 10, 70, 25); | 24 | label->setGeometry(10, 10, 70, 25); |
11 | label->setBuddy(edit); | 25 | label->setBuddy(edit); |
12 | 26 | ||
13 | resize(200, 45); | 27 | resize(200, 45); |
14 | } | 28 | } |
15 | 29 | ||
16 | TextDialog::~TextDialog() | 30 | TextDialog::~TextDialog() |
17 | { | 31 | { |
18 | } | 32 | } |
19 | 33 | ||
20 | int TextDialog::exec(const QString &caption, const QString &text, const QString &value="") | 34 | int TextDialog::exec(const QString &caption, const QString &text, const QString &value="") |
21 | { | 35 | { |
22 | setCaption(caption); | 36 | setCaption(caption); |
23 | label->setText(text); | 37 | label->setText(text); |
24 | edit->setText(value); | 38 | edit->setText(value); |
25 | 39 | ||
26 | return QDialog::exec(); | 40 | return QDialog::exec(); |
27 | } | 41 | } |
28 | 42 | ||
29 | QString TextDialog::getValue() | 43 | QString TextDialog::getValue() |
30 | { | 44 | { |
31 | return edit->text(); | 45 | return edit->text(); |
32 | } | 46 | } |
diff --git a/noncore/apps/opie-sheet/textdlg.h b/noncore/apps/opie-sheet/textdlg.h index f948228..78ef580 100644 --- a/noncore/apps/opie-sheet/textdlg.h +++ b/noncore/apps/opie-sheet/textdlg.h | |||
@@ -1,24 +1,38 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * This program is free software; you can redistribute it and/or modify * | ||
4 | * it under the terms of the GNU General Public License as published by * | ||
5 | * the Free Software Foundation; either version 2 of the License, or * | ||
6 | * (at your option) any later version. * | ||
7 | * * | ||
8 | ***************************************************************************/ | ||
9 | |||
10 | /* | ||
11 | * Opie Sheet (formerly Sheet/Qt) | ||
12 | * by Serdar Ozler <sozler@sitebest.com> | ||
13 | */ | ||
14 | |||
1 | #ifndef TEXTDLG_H | 15 | #ifndef TEXTDLG_H |
2 | #define TEXTDLG_H | 16 | #define TEXTDLG_H |
3 | 17 | ||
4 | #include <qdialog.h> | 18 | #include <qdialog.h> |
5 | #include <qlabel.h> | 19 | #include <qlabel.h> |
6 | #include <qlineedit.h> | 20 | #include <qlineedit.h> |
7 | 21 | ||
8 | class TextDialog: public QDialog | 22 | class TextDialog: public QDialog |
9 | { | 23 | { |
10 | Q_OBJECT | 24 | Q_OBJECT |
11 | 25 | ||
12 | // QT objects | 26 | // QT objects |
13 | QLabel *label; | 27 | QLabel *label; |
14 | QLineEdit *edit; | 28 | QLineEdit *edit; |
15 | 29 | ||
16 | public: | 30 | public: |
17 | TextDialog(QWidget *parent=0); | 31 | TextDialog(QWidget *parent=0); |
18 | ~TextDialog(); | 32 | ~TextDialog(); |
19 | 33 | ||
20 | int exec(const QString &caption, const QString &text, const QString &value=""); | 34 | int exec(const QString &caption, const QString &text, const QString &value=""); |
21 | QString getValue(); | 35 | QString getValue(); |
22 | }; | 36 | }; |
23 | 37 | ||
24 | #endif | 38 | #endif |