-rw-r--r-- | noncore/apps/opie-sheet/cellformat.cpp | 47 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/finddlg.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/mainwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/numberdlg.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sheet.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/sortdlg.cpp | 5 | ||||
-rw-r--r-- | noncore/apps/opie-sheet/textdlg.cpp | 5 |
7 files changed, 55 insertions, 25 deletions
diff --git a/noncore/apps/opie-sheet/cellformat.cpp b/noncore/apps/opie-sheet/cellformat.cpp index 597502c..342ebe9 100644 --- a/noncore/apps/opie-sheet/cellformat.cpp +++ b/noncore/apps/opie-sheet/cellformat.cpp | |||
@@ -22,20 +22,41 @@ | |||
22 | 22 | ||
23 | #define COLOR_COUNT 17 | 23 | #define COLOR_COUNT 17 |
24 | #define STYLE_COUNT 14 | 24 | #define STYLE_COUNT 14 |
25 | #define HALIGN_COUNT 3 | 25 | #define HALIGN_COUNT 3 |
26 | #define VALIGN_COUNT 3 | 26 | #define VALIGN_COUNT 3 |
27 | 27 | ||
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}; | 28 | QColor qtColors[COLOR_COUNT]={Qt::black,Qt::white, Qt::darkGray, |
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}; | 29 | Qt::gray, Qt::lightGray, Qt::red, |
30 | Qt::green, Qt::blue, Qt::cyan, | ||
31 | Qt::magenta, Qt::yellow, | ||
32 | Qt::darkRed, Qt::darkGreen, | ||
33 | Qt::darkBlue, Qt::darkCyan, | ||
34 | Qt::darkMagenta, Qt::darkYellow}; | ||
35 | |||
36 | Qt::BrushStyle brushStyles[STYLE_COUNT]={Qt::SolidPattern, | ||
37 | Qt::Dense1Pattern, Qt::Dense2Pattern, | ||
38 | Qt::Dense3Pattern, Qt::Dense4Pattern, | ||
39 | Qt::Dense5Pattern, Qt::Dense6Pattern, | ||
40 | Qt::Dense7Pattern, Qt::HorPattern, | ||
41 | Qt::VerPattern, Qt::CrossPattern, | ||
42 | Qt::BDiagPattern, Qt::FDiagPattern, | ||
43 | Qt::DiagCrossPattern}; | ||
44 | |||
30 | QString namesHAlign[HALIGN_COUNT]={"Left", "Right", "Center"}; | 45 | QString namesHAlign[HALIGN_COUNT]={"Left", "Right", "Center"}; |
31 | QString namesVAlign[VALIGN_COUNT]={"Top", "Bottom", "Center"}; | 46 | QString namesVAlign[VALIGN_COUNT]={"Top", "Bottom", "Center"}; |
32 | Qt::AlignmentFlags flagsHAlign[HALIGN_COUNT]={Qt::AlignLeft, Qt::AlignRight, Qt::AlignHCenter}; | ||
33 | Qt::AlignmentFlags flagsVAlign[VALIGN_COUNT]={Qt::AlignTop, Qt::AlignBottom, Qt::AlignVCenter}; | ||
34 | 47 | ||
35 | CellFormat::CellFormat(QWidget *parent=0) | 48 | Qt::AlignmentFlags flagsHAlign[HALIGN_COUNT]={Qt::AlignLeft, |
49 | Qt::AlignRight, | ||
50 | Qt::AlignHCenter}; | ||
51 | |||
52 | Qt::AlignmentFlags flagsVAlign[VALIGN_COUNT]={Qt::AlignTop, | ||
53 | Qt::AlignBottom, | ||
54 | Qt::AlignVCenter}; | ||
55 | |||
56 | CellFormat::CellFormat(QWidget *parent) | ||
36 | :QDialog(parent, 0, TRUE) | 57 | :QDialog(parent, 0, TRUE) |
37 | { | 58 | { |
38 | // Main widget | 59 | // Main widget |
39 | tabs=new QTabWidget(this); | 60 | tabs=new QTabWidget(this); |
40 | widgetBorders=new QWidget(tabs); | 61 | widgetBorders=new QWidget(tabs); |
41 | widgetBackground=new QWidget(tabs); | 62 | widgetBackground=new QWidget(tabs); |
@@ -49,20 +70,24 @@ CellFormat::CellFormat(QWidget *parent=0) | |||
49 | fontDB.loadRenderers(); | 70 | fontDB.loadRenderers(); |
50 | changedFont=changedAlign=changedBrush=FALSE; | 71 | changedFont=changedAlign=changedBrush=FALSE; |
51 | 72 | ||
52 | // Borders tab | 73 | // Borders tab |
53 | borderEditor=new BorderEditor(widgetBorders); | 74 | borderEditor=new BorderEditor(widgetBorders); |
54 | borderEditor->setGeometry(10, 10, 215, 145); | 75 | borderEditor->setGeometry(10, 10, 215, 145); |
55 | connect(borderEditor, SIGNAL(clicked(BorderEditor::BorderArea)), this, SLOT(borderClicked(BorderEditor::BorderArea))); | 76 | connect(borderEditor, SIGNAL(clicked(BorderEditor::BorderArea)), |
77 | this, SLOT(borderClicked(BorderEditor::BorderArea))); | ||
56 | 78 | ||
57 | comboBordersWidth=createCombo(COMBO_WIDTH, widgetBorders, tr("&Width:"), 165); | 79 | comboBordersWidth=createCombo(COMBO_WIDTH, widgetBorders, tr("&Width:"), 165); |
58 | comboBordersColor=createCombo(COMBO_COLOR, widgetBorders, tr("&Color:"), 165+(COMBO_HEIGHTS+10)); | 80 | comboBordersColor=createCombo(COMBO_COLOR, widgetBorders, tr("&Color:"), 165+(COMBO_HEIGHTS+10)); |
59 | 81 | ||
60 | buttonBordersDefaults=new QPushButton(tr("&Default Borders"), widgetBorders); | 82 | buttonBordersDefaults=new QPushButton(tr("&Default Borders"), widgetBorders); |
61 | buttonBordersDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS); | 83 | buttonBordersDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), |
62 | connect(buttonBordersDefaults, SIGNAL(clicked()), this, SLOT(slotBordersDefaults())); | 84 | 110, COMBO_HEIGHTS); |
85 | |||
86 | connect(buttonBordersDefaults, SIGNAL(clicked()), | ||
87 | this, SLOT(slotBordersDefaults())); | ||
63 | 88 | ||
64 | // Background tab | 89 | // Background tab |
65 | frameBackground=new QFrame(widgetBackground); | 90 | frameBackground=new QFrame(widgetBackground); |
66 | frameBackground->setGeometry(10, 10, 215, 145); | 91 | frameBackground->setGeometry(10, 10, 215, 145); |
67 | frameBackground->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); | 92 | frameBackground->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); |
68 | 93 | ||
@@ -289,13 +314,14 @@ int CellFormat::findComboItemIndex(QComboBox *combo, const QString &item) | |||
289 | for (int i=0; i<combo->count(); ++i) | 314 | for (int i=0; i<combo->count(); ++i) |
290 | if (combo->text(i)==item) | 315 | if (combo->text(i)==item) |
291 | return i; | 316 | return i; |
292 | return 0; | 317 | return 0; |
293 | } | 318 | } |
294 | 319 | ||
295 | QComboBox *CellFormat::createCombo(comboType type, QWidget *parent, const QString &caption, int y) | 320 | QComboBox *CellFormat::createCombo(comboType type, QWidget *parent, |
321 | const QString &caption, int y) | ||
296 | { | 322 | { |
297 | QComboBox *combo=new QComboBox(FALSE, parent); | 323 | QComboBox *combo=new QComboBox(FALSE, parent); |
298 | combo->setGeometry(70, y, COMBO_WIDTHS, COMBO_HEIGHTS); | 324 | combo->setGeometry(70, y, COMBO_WIDTHS, COMBO_HEIGHTS); |
299 | combo->setSizeLimit(5); | 325 | combo->setSizeLimit(5); |
300 | 326 | ||
301 | switch (type) | 327 | switch (type) |
@@ -304,12 +330,13 @@ QComboBox *CellFormat::createCombo(comboType type, QWidget *parent, const QStrin | |||
304 | case COMBO_STYLE: createStyleCombo(combo); break; | 330 | case COMBO_STYLE: createStyleCombo(combo); break; |
305 | case COMBO_FONT: createFontCombo(combo); break; | 331 | case COMBO_FONT: createFontCombo(combo); break; |
306 | case COMBO_SIZE: createSizeCombo(combo); break; | 332 | case COMBO_SIZE: createSizeCombo(combo); break; |
307 | case COMBO_COLOR: createColorCombo(combo); break; | 333 | case COMBO_COLOR: createColorCombo(combo); break; |
308 | case COMBO_HALIGN: createHAlignCombo(combo); break; | 334 | case COMBO_HALIGN: createHAlignCombo(combo); break; |
309 | case COMBO_VALIGN: createVAlignCombo(combo); break; | 335 | case COMBO_VALIGN: createVAlignCombo(combo); break; |
336 | default: break; | ||
310 | } | 337 | } |
311 | 338 | ||
312 | QLabel *label=new QLabel(combo, caption, parent); | 339 | QLabel *label=new QLabel(combo, caption, parent); |
313 | label->setGeometry(10, y, 50, COMBO_HEIGHTS); | 340 | label->setGeometry(10, y, 50, COMBO_HEIGHTS); |
314 | 341 | ||
315 | return combo; | 342 | return combo; |
@@ -492,13 +519,13 @@ int CellFormat::exec(Sheet *s) | |||
492 | } | 519 | } |
493 | 520 | ||
494 | // | 521 | // |
495 | // Border Editor | 522 | // Border Editor |
496 | // | 523 | // |
497 | 524 | ||
498 | BorderEditor::BorderEditor(QWidget *parent=0) | 525 | BorderEditor::BorderEditor(QWidget *parent) |
499 | :QFrame(parent) | 526 | :QFrame(parent) |
500 | { | 527 | { |
501 | setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); | 528 | setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); |
502 | } | 529 | } |
503 | 530 | ||
504 | BorderEditor::~BorderEditor() | 531 | BorderEditor::~BorderEditor() |
diff --git a/noncore/apps/opie-sheet/finddlg.cpp b/noncore/apps/opie-sheet/finddlg.cpp index d1237ca..e4c6ec8 100644 --- a/noncore/apps/opie-sheet/finddlg.cpp +++ b/noncore/apps/opie-sheet/finddlg.cpp | |||
@@ -13,13 +13,13 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <qlabel.h> | 15 | #include <qlabel.h> |
16 | #include <qradiobutton.h> | 16 | #include <qradiobutton.h> |
17 | #include "finddlg.h" | 17 | #include "finddlg.h" |
18 | 18 | ||
19 | FindDialog::FindDialog(QWidget *parent=0) | 19 | FindDialog::FindDialog(QWidget *parent) |
20 | :QDialog(parent, 0, TRUE) | 20 | :QDialog(parent, 0, TRUE) |
21 | { | 21 | { |
22 | // Main widget | 22 | // Main widget |
23 | tabs=new QTabWidget(this); | 23 | tabs=new QTabWidget(this); |
24 | widgetFind=new QWidget(tabs); | 24 | widgetFind=new QWidget(tabs); |
25 | widgetOptions=new QWidget(tabs); | 25 | widgetOptions=new QWidget(tabs); |
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp index 09ee68b..2f07bae 100644 --- a/noncore/apps/opie-sheet/mainwindow.cpp +++ b/noncore/apps/opie-sheet/mainwindow.cpp | |||
@@ -163,13 +163,13 @@ void MainWindow::documentOpen(const DocLnk &lnkDoc) | |||
163 | sheet->setName(newSheet->name); | 163 | sheet->setName(newSheet->name); |
164 | sheet->setSheetData(&newSheet->data); | 164 | sheet->setSheetData(&newSheet->data); |
165 | } | 165 | } |
166 | } | 166 | } |
167 | } | 167 | } |
168 | 168 | ||
169 | int MainWindow::saveCurrentFile(bool ask=TRUE) | 169 | int MainWindow::saveCurrentFile(bool ask) |
170 | { | 170 | { |
171 | if (ask) | 171 | if (ask) |
172 | { | 172 | { |
173 | int result=QMessageBox::information(this, tr("Save File"), tr("Do you want to save the current file?"), QMessageBox::Yes, QMessageBox::No, QMessageBox::Cancel); | 173 | int result=QMessageBox::information(this, tr("Save File"), tr("Do you want to save the current file?"), QMessageBox::Yes, QMessageBox::No, QMessageBox::Cancel); |
174 | if (result!=QMessageBox::Yes) return result; | 174 | if (result!=QMessageBox::Yes) return result; |
175 | } | 175 | } |
diff --git a/noncore/apps/opie-sheet/numberdlg.cpp b/noncore/apps/opie-sheet/numberdlg.cpp index e8de639..90fbaa2 100644 --- a/noncore/apps/opie-sheet/numberdlg.cpp +++ b/noncore/apps/opie-sheet/numberdlg.cpp | |||
@@ -11,13 +11,13 @@ | |||
11 | * Opie Sheet (formerly Sheet/Qt) | 11 | * Opie Sheet (formerly Sheet/Qt) |
12 | * by Serdar Ozler <sozler@sitebest.com> | 12 | * by Serdar Ozler <sozler@sitebest.com> |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "numberdlg.h" | 15 | #include "numberdlg.h" |
16 | 16 | ||
17 | NumberDialog::NumberDialog(QWidget *parent=0) | 17 | NumberDialog::NumberDialog(QWidget *parent) |
18 | :QDialog(parent, 0, TRUE) | 18 | :QDialog(parent, 0, TRUE) |
19 | { | 19 | { |
20 | edit=new QSpinBox(this); | 20 | edit=new QSpinBox(this); |
21 | edit->setGeometry(120, 10, 70, 25); | 21 | edit->setGeometry(120, 10, 70, 25); |
22 | 22 | ||
23 | label=new QLabel(this); | 23 | label=new QLabel(this); |
@@ -28,13 +28,14 @@ NumberDialog::NumberDialog(QWidget *parent=0) | |||
28 | } | 28 | } |
29 | 29 | ||
30 | NumberDialog::~NumberDialog() | 30 | NumberDialog::~NumberDialog() |
31 | { | 31 | { |
32 | } | 32 | } |
33 | 33 | ||
34 | 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, |
35 | int value, int min, int max, int step) | ||
35 | { | 36 | { |
36 | setCaption(caption); | 37 | setCaption(caption); |
37 | label->setText(text); | 38 | label->setText(text); |
38 | edit->setValue(value); | 39 | edit->setValue(value); |
39 | edit->setMinValue(min); | 40 | edit->setMinValue(min); |
40 | edit->setMaxValue(max); | 41 | edit->setMaxValue(max); |
diff --git a/noncore/apps/opie-sheet/sheet.cpp b/noncore/apps/opie-sheet/sheet.cpp index 1d7ec6f..2279191 100644 --- a/noncore/apps/opie-sheet/sheet.cpp +++ b/noncore/apps/opie-sheet/sheet.cpp | |||
@@ -104,13 +104,13 @@ void Sheet::swapCells(int row1, int col1, int row2, int col2) | |||
104 | setText(cellData1->row, cellData1->col, dataParser(cellData1->data)); | 104 | setText(cellData1->row, cellData1->col, dataParser(cellData1->data)); |
105 | setText(cellData2->row, cellData2->col, dataParser(cellData2->data)); | 105 | setText(cellData2->row, cellData2->col, dataParser(cellData2->data)); |
106 | emit sheetModified(); | 106 | emit sheetModified(); |
107 | } | 107 | } |
108 | } | 108 | } |
109 | 109 | ||
110 | 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, const QString funcName) |
111 | { | 111 | { |
112 | QString params(parameters); | 112 | QString params(parameters); |
113 | int position; | 113 | int position; |
114 | for (int i=0; i<paramNo; ++i) | 114 | for (int i=0; i<paramNo; ++i) |
115 | { | 115 | { |
116 | position=params.find(','); | 116 | position=params.find(','); |
@@ -142,13 +142,13 @@ bool Sheet::findRange(const QString &variable1, const QString &variable2, int *r | |||
142 | *col1=*col2; | 142 | *col1=*col2; |
143 | *col2=col; | 143 | *col2=col; |
144 | } | 144 | } |
145 | return TRUE; | 145 | return TRUE; |
146 | } | 146 | } |
147 | 147 | ||
148 | bool Sheet::findRowColumn(const QString &variable, int *row, int *col, bool giveError=FALSE) | 148 | bool Sheet::findRowColumn(const QString &variable, int *row, int *col, bool giveError) |
149 | { | 149 | { |
150 | int position=variable.find(QRegExp("\\d")); | 150 | int position=variable.find(QRegExp("\\d")); |
151 | if (position<1) | 151 | if (position<1) |
152 | { | 152 | { |
153 | if (giveError) QMessageBox::critical(this, tr("Error"), tr("Invalid variable: '"+variable+'\'')); | 153 | if (giveError) QMessageBox::critical(this, tr("Error"), tr("Invalid variable: '"+variable+'\'')); |
154 | return FALSE; | 154 | return FALSE; |
@@ -449,13 +449,13 @@ QString Sheet::getData() | |||
449 | typeCellData *cellData=findCellData(currentRow(), currentColumn()); | 449 | typeCellData *cellData=findCellData(currentRow(), currentColumn()); |
450 | if (cellData) | 450 | if (cellData) |
451 | return cellData->data; | 451 | return cellData->data; |
452 | return ""; | 452 | return ""; |
453 | } | 453 | } |
454 | 454 | ||
455 | void Sheet::lockClicks(bool lock=TRUE) | 455 | void Sheet::lockClicks(bool lock) |
456 | { | 456 | { |
457 | clicksLocked=lock; | 457 | clicksLocked=lock; |
458 | } | 458 | } |
459 | 459 | ||
460 | void Sheet::paintCell(QPainter *p, int row, int col, const QRect & cr, bool selected) | 460 | void Sheet::paintCell(QPainter *p, int row, int col, const QRect & cr, bool selected) |
461 | { | 461 | { |
@@ -733,13 +733,13 @@ void Sheet::editCopy() | |||
733 | void Sheet::editCut() | 733 | void Sheet::editCut() |
734 | { | 734 | { |
735 | editCopy(); | 735 | editCopy(); |
736 | editClear(); | 736 | editClear(); |
737 | } | 737 | } |
738 | 738 | ||
739 | void Sheet::editPaste(bool onlyContents=FALSE) | 739 | void Sheet::editPaste(bool onlyContents) |
740 | { | 740 | { |
741 | int row1=currentRow(), col1=currentColumn(); | 741 | int row1=currentRow(), col1=currentColumn(); |
742 | typeCellData *cellData, *tempCellData; | 742 | typeCellData *cellData, *tempCellData; |
743 | 743 | ||
744 | for (tempCellData=clipboardData.first(); tempCellData; tempCellData=clipboardData.next()) | 744 | for (tempCellData=clipboardData.first(); tempCellData; tempCellData=clipboardData.next()) |
745 | { | 745 | { |
@@ -758,13 +758,13 @@ void Sheet::editPaste(bool onlyContents=FALSE) | |||
758 | setText(cellData->row, cellData->col, dataParser(cellData->data)); | 758 | setText(cellData->row, cellData->col, dataParser(cellData->data)); |
759 | emit sheetModified(); | 759 | emit sheetModified(); |
760 | } | 760 | } |
761 | } | 761 | } |
762 | } | 762 | } |
763 | 763 | ||
764 | void Sheet::insertRows(int no=1, bool allColumns=TRUE) | 764 | void Sheet::insertRows(int no, bool allColumns) |
765 | { | 765 | { |
766 | setNumRows(numRows()+no); | 766 | setNumRows(numRows()+no); |
767 | 767 | ||
768 | typeCellData *tempCellData; | 768 | typeCellData *tempCellData; |
769 | int row=currentRow(), col=currentColumn(); | 769 | int row=currentRow(), col=currentColumn(); |
770 | 770 | ||
@@ -780,13 +780,13 @@ void Sheet::insertRows(int no=1, bool allColumns=TRUE) | |||
780 | updateCell(tempCellData->row-no, tempCellData->col); | 780 | updateCell(tempCellData->row-no, tempCellData->col); |
781 | setText(tempCellData->row, tempCellData->col, dataParser(tempCellData->data)); | 781 | setText(tempCellData->row, tempCellData->col, dataParser(tempCellData->data)); |
782 | } | 782 | } |
783 | emit sheetModified(); | 783 | emit sheetModified(); |
784 | } | 784 | } |
785 | 785 | ||
786 | void Sheet::insertColumns(int no=1, bool allRows=TRUE) | 786 | void Sheet::insertColumns(int no, bool allRows) |
787 | { | 787 | { |
788 | int noCols=numCols(); | 788 | int noCols=numCols(); |
789 | int newCols=noCols+no; | 789 | int newCols=noCols+no; |
790 | setNumCols(newCols); | 790 | setNumCols(newCols); |
791 | for (int i=noCols; i<newCols; ++i) | 791 | for (int i=noCols; i<newCols; ++i) |
792 | horizontalHeader()->setLabel(i, getHeaderString(i+1), DEFAULT_COL_WIDTH); | 792 | horizontalHeader()->setLabel(i, getHeaderString(i+1), DEFAULT_COL_WIDTH); |
@@ -806,13 +806,13 @@ void Sheet::insertColumns(int no=1, bool allRows=TRUE) | |||
806 | updateCell(tempCellData->row, tempCellData->col-no); | 806 | updateCell(tempCellData->row, tempCellData->col-no); |
807 | setText(tempCellData->row, tempCellData->col, dataParser(tempCellData->data)); | 807 | setText(tempCellData->row, tempCellData->col, dataParser(tempCellData->data)); |
808 | } | 808 | } |
809 | emit sheetModified(); | 809 | emit sheetModified(); |
810 | } | 810 | } |
811 | 811 | ||
812 | void Sheet::dataFindReplace(const QString &findStr, const QString &replaceStr, bool matchCase=TRUE, bool allCells=TRUE, bool entireCell=FALSE, bool replace=FALSE, bool replaceAll=FALSE) | 812 | void Sheet::dataFindReplace(const QString &findStr, const QString &replaceStr, bool matchCase, bool allCells, bool entireCell, bool replace, bool replaceAll) |
813 | { | 813 | { |
814 | typeCellData *tempCellData; | 814 | typeCellData *tempCellData; |
815 | int row1, col1, row2, col2; | 815 | int row1, col1, row2, col2; |
816 | getSelection(&row1, &col1, &row2, &col2); | 816 | getSelection(&row1, &col1, &row2, &col2); |
817 | bool found=FALSE; | 817 | bool found=FALSE; |
818 | 818 | ||
diff --git a/noncore/apps/opie-sheet/sortdlg.cpp b/noncore/apps/opie-sheet/sortdlg.cpp index c60be0d..c2cdec8 100644 --- a/noncore/apps/opie-sheet/sortdlg.cpp +++ b/noncore/apps/opie-sheet/sortdlg.cpp | |||
@@ -14,13 +14,13 @@ | |||
14 | 14 | ||
15 | #include <qlabel.h> | 15 | #include <qlabel.h> |
16 | #include <qradiobutton.h> | 16 | #include <qradiobutton.h> |
17 | #include <qmessagebox.h> | 17 | #include <qmessagebox.h> |
18 | #include "sortdlg.h" | 18 | #include "sortdlg.h" |
19 | 19 | ||
20 | SortDialog::SortDialog(QWidget *parent=0) | 20 | SortDialog::SortDialog(QWidget *parent) |
21 | :QDialog(parent, 0, TRUE) | 21 | :QDialog(parent, 0, TRUE) |
22 | { | 22 | { |
23 | // Main widget | 23 | // Main widget |
24 | tabs=new QTabWidget(this); | 24 | tabs=new QTabWidget(this); |
25 | widgetSort=new QWidget(tabs); | 25 | widgetSort=new QWidget(tabs); |
26 | widgetOptions=new QWidget(tabs); | 26 | widgetOptions=new QWidget(tabs); |
@@ -175,13 +175,14 @@ int SortDialog::exec(Sheet *s) | |||
175 | } | 175 | } |
176 | return QDialog::Accepted; | 176 | return QDialog::Accepted; |
177 | } | 177 | } |
178 | return QDialog::Rejected; | 178 | return QDialog::Rejected; |
179 | } | 179 | } |
180 | 180 | ||
181 | int SortDialog::compareItems(QTableItem *item1, QTableItem *item2, int descending=0, bool caseSensitive=TRUE) | 181 | int SortDialog::compareItems(QTableItem *item1, QTableItem *item2, |
182 | int descending, bool caseSensitive) | ||
182 | { | 183 | { |
183 | int result=0; | 184 | int result=0; |
184 | if (item1) | 185 | if (item1) |
185 | { | 186 | { |
186 | if (item2) result=(caseSensitive ? item1->text().compare(item2->text()) : item1->text().upper().compare(item2->text().upper())); | 187 | if (item2) result=(caseSensitive ? item1->text().compare(item2->text()) : item1->text().upper().compare(item2->text().upper())); |
187 | else result=-1; | 188 | else result=-1; |
diff --git a/noncore/apps/opie-sheet/textdlg.cpp b/noncore/apps/opie-sheet/textdlg.cpp index 0810eb2..34cec29 100644 --- a/noncore/apps/opie-sheet/textdlg.cpp +++ b/noncore/apps/opie-sheet/textdlg.cpp | |||
@@ -11,13 +11,13 @@ | |||
11 | * Opie Sheet (formerly Sheet/Qt) | 11 | * Opie Sheet (formerly Sheet/Qt) |
12 | * by Serdar Ozler <sozler@sitebest.com> | 12 | * by Serdar Ozler <sozler@sitebest.com> |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "textdlg.h" | 15 | #include "textdlg.h" |
16 | 16 | ||
17 | TextDialog::TextDialog(QWidget *parent=0) | 17 | TextDialog::TextDialog(QWidget *parent) |
18 | :QDialog(parent, 0, TRUE) | 18 | :QDialog(parent, 0, TRUE) |
19 | { | 19 | { |
20 | edit=new QLineEdit(this); | 20 | edit=new QLineEdit(this); |
21 | edit->setGeometry(90, 10, 100, 25); | 21 | edit->setGeometry(90, 10, 100, 25); |
22 | 22 | ||
23 | label=new QLabel(this); | 23 | label=new QLabel(this); |
@@ -28,13 +28,14 @@ TextDialog::TextDialog(QWidget *parent=0) | |||
28 | } | 28 | } |
29 | 29 | ||
30 | TextDialog::~TextDialog() | 30 | TextDialog::~TextDialog() |
31 | { | 31 | { |
32 | } | 32 | } |
33 | 33 | ||
34 | int TextDialog::exec(const QString &caption, const QString &text, const QString &value="") | 34 | int TextDialog::exec(const QString &caption, const QString &text, |
35 | const QString &value) | ||
35 | { | 36 | { |
36 | setCaption(caption); | 37 | setCaption(caption); |
37 | label->setText(text); | 38 | label->setText(text); |
38 | edit->setText(value); | 39 | edit->setText(value); |
39 | 40 | ||
40 | return QDialog::exec(); | 41 | return QDialog::exec(); |