1 files changed, 37 insertions, 10 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
@@ -16,59 +16,84 @@
 
 #include <qlistbox.h>
 #include <qlabel.h>
 
 #define COMBO_WIDTHS 155
 #define COMBO_HEIGHTS 21
 
 #define COLOR_COUNT 17
 #define STYLE_COUNT 14
 #define HALIGN_COUNT 3
 #define VALIGN_COUNT 3
 
-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};
-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};
+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};
+
+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};
+
 QString namesHAlign[HALIGN_COUNT]={"Left", "Right", "Center"};
 QString namesVAlign[VALIGN_COUNT]={"Top", "Bottom", "Center"};
-Qt::AlignmentFlags flagsHAlign[HALIGN_COUNT]={Qt::AlignLeft, Qt::AlignRight, Qt::AlignHCenter};
-Qt::AlignmentFlags flagsVAlign[VALIGN_COUNT]={Qt::AlignTop, Qt::AlignBottom, Qt::AlignVCenter};
 
-CellFormat::CellFormat(QWidget *parent=0)
+Qt::AlignmentFlags flagsHAlign[HALIGN_COUNT]={Qt::AlignLeft,
+                                              Qt::AlignRight,
+                                              Qt::AlignHCenter};
+
+Qt::AlignmentFlags flagsVAlign[VALIGN_COUNT]={Qt::AlignTop,
+                                              Qt::AlignBottom,
+                                              Qt::AlignVCenter};
+
+CellFormat::CellFormat(QWidget *parent)
            :QDialog(parent, 0, TRUE)
 {
   // Main widget
   tabs=new QTabWidget(this);
   widgetBorders=new QWidget(tabs);
   widgetBackground=new QWidget(tabs);
   widgetFont=new QWidget(tabs);
   widgetAlignment=new QWidget(tabs);
   tabs->addTab(widgetBorders, tr("&Borders"));
   tabs->addTab(widgetBackground, tr("Back&ground"));
   tabs->addTab(widgetFont, tr("&Font"));
   tabs->addTab(widgetAlignment, tr("&Alignment"));
 
   fontDB.loadRenderers();
   changedFont=changedAlign=changedBrush=FALSE;
 
   // Borders tab
   borderEditor=new BorderEditor(widgetBorders);
   borderEditor->setGeometry(10, 10, 215, 145);
-  connect(borderEditor, SIGNAL(clicked(BorderEditor::BorderArea)), this, SLOT(borderClicked(BorderEditor::BorderArea)));
+  connect(borderEditor, SIGNAL(clicked(BorderEditor::BorderArea)),
+          this, SLOT(borderClicked(BorderEditor::BorderArea)));
 
   comboBordersWidth=createCombo(COMBO_WIDTH, widgetBorders, tr("&Width:"), 165);
   comboBordersColor=createCombo(COMBO_COLOR, widgetBorders, tr("&Color:"), 165+(COMBO_HEIGHTS+10));
 
   buttonBordersDefaults=new QPushButton(tr("&Default Borders"), widgetBorders);
-  buttonBordersDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10), 110, COMBO_HEIGHTS);
-  connect(buttonBordersDefaults, SIGNAL(clicked()), this, SLOT(slotBordersDefaults()));
+  buttonBordersDefaults->setGeometry(115, 165+2*(COMBO_HEIGHTS+10),
+                                     110, COMBO_HEIGHTS);
+
+  connect(buttonBordersDefaults, SIGNAL(clicked()),
+          this, SLOT(slotBordersDefaults()));
 
   // Background tab
   frameBackground=new QFrame(widgetBackground);
   frameBackground->setGeometry(10, 10, 215, 145);
   frameBackground->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
 
   comboBackgroundStyle=createCombo(COMBO_STYLE, widgetBackground, tr("&Style:"), 165);
   connect(comboBackgroundStyle, SIGNAL(activated(int)), this, SLOT(backgroundClicked(int)));
   comboBackgroundColor=createCombo(COMBO_COLOR, widgetBackground, tr("&Color:"), 165+(COMBO_HEIGHTS+10));
   connect(comboBackgroundColor, SIGNAL(activated(int)), this, SLOT(backgroundClicked(int)));
 
   buttonBackgroundDefaults=new QPushButton(tr("&Default Background"), widgetBackground);
@@ -283,39 +308,41 @@ void CellFormat::borderClicked(BorderEditor::BorderArea area)
   else
     borderEditor->setPen(newPen, area);
 }
 
 int CellFormat::findComboItemIndex(QComboBox *combo, const QString &item)
 {
   for (int i=0; i<combo->count(); ++i)
     if (combo->text(i)==item)
       return i;
   return 0;
 }
 
-QComboBox *CellFormat::createCombo(comboType type, QWidget *parent, const QString &caption, int y)
+QComboBox *CellFormat::createCombo(comboType type, QWidget *parent,
+                                   const QString &caption, int y)
 {
   QComboBox *combo=new QComboBox(FALSE, parent);
   combo->setGeometry(70, y, COMBO_WIDTHS, COMBO_HEIGHTS);
   combo->setSizeLimit(5);
 
   switch (type)
   {
     case COMBO_WIDTH: createWidthCombo(combo); break;
     case COMBO_STYLE: createStyleCombo(combo); break;
     case COMBO_FONT: createFontCombo(combo); break;
     case COMBO_SIZE: createSizeCombo(combo); break;
     case COMBO_COLOR: createColorCombo(combo); break;
     case COMBO_HALIGN: createHAlignCombo(combo); break;
     case COMBO_VALIGN: createVAlignCombo(combo); break;
+  default: break;
   }
 
   QLabel *label=new QLabel(combo, caption, parent);
   label->setGeometry(10, y, 50, COMBO_HEIGHTS);
 
   return combo;
 }
 
 void CellFormat::createHAlignCombo(QComboBox *combo)
 {
   for (int i=0; i<HALIGN_COUNT; ++i)
     combo->insertItem(namesHAlign[i]);
@@ -486,25 +513,25 @@ int CellFormat::exec(Sheet *s)
         for (col=col1; col<=col2; ++col)
           sheet->setTextFont(row, col, fontFont, fontColor);
     }
     return QDialog::Accepted;
   }
   return QDialog::Rejected;
 }
 
 //
 // Border Editor
 //
 
-BorderEditor::BorderEditor(QWidget *parent=0)
+BorderEditor::BorderEditor(QWidget *parent)
              :QFrame(parent)
 {
   setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
 }
 
 BorderEditor::~BorderEditor()
 {
 }
 
 void BorderEditor::drawContents(QPainter *p)
 {
   QFrame::drawContents(p);