diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/crystalclient.cc | 56 | ||||
| -rw-r--r-- | client/crystalclient.h | 6 |
2 files changed, 31 insertions, 31 deletions
diff --git a/client/crystalclient.cc b/client/crystalclient.cc index 466ac87..1b7d74a 100644 --- a/client/crystalclient.cc +++ b/client/crystalclient.cc @@ -762,40 +762,40 @@ void CrystalClient::init() // for flicker-free redraws widget()->setBackgroundMode(NoBackground); - // setup tqlayout - maintqlayout = new TQGridLayout(widget(), 4, 3); // 4x3 grid - titletqlayout = new TQHBoxLayout(); + // setup layout + mainlayout = new TQGridLayout(widget(), 4, 3); // 4x3 grid + titlelayout = new TQHBoxLayout(); titlebar_ = new TQSpacerItem(1, ::factory->titlesize-1, TQSizePolicy::Expanding, TQSizePolicy::Fixed); - maintqlayout->setResizeMode(TQLayout::FreeResize); - maintqlayout->setRowSpacing(0, (::factory->buttontheme==5)?0:1); - maintqlayout->setRowSpacing(3, ::factory->borderwidth*1); + mainlayout->setResizeMode(TQLayout::FreeResize); + mainlayout->setRowSpacing(0, (::factory->buttontheme==5)?0:1); + mainlayout->setRowSpacing(3, ::factory->borderwidth*1); - maintqlayout->setColSpacing(2,borderSpacing()); - maintqlayout->setColSpacing(0,borderSpacing()); - maintqlayout->addLayout(titletqlayout, 1, 1); + mainlayout->setColSpacing(2,borderSpacing()); + mainlayout->setColSpacing(0,borderSpacing()); + mainlayout->addLayout(titlelayout, 1, 1); if (isPreview()) { char c[512]; sprintf(c,"<center><b>Crystal %s Preview</b><br>Built: %s</center>",VERSION,__DATE__); - maintqlayout->addItem(new TQSpacerItem(1, 1,TQSizePolicy::Expanding,TQSizePolicy::Fixed), 0, 1); - maintqlayout->addItem(new TQSpacerItem(1, ::factory->borderwidth,TQSizePolicy::Expanding,TQSizePolicy::Expanding), 3, 1); - maintqlayout->addWidget(new TQLabel(i18n(c),widget()), 2, 1); + mainlayout->addItem(new TQSpacerItem(1, 1,TQSizePolicy::Expanding,TQSizePolicy::Fixed), 0, 1); + mainlayout->addItem(new TQSpacerItem(1, ::factory->borderwidth,TQSizePolicy::Expanding,TQSizePolicy::Expanding), 3, 1); + mainlayout->addWidget(new TQLabel(i18n(c),widget()), 2, 1); } else { - maintqlayout->addItem(new TQSpacerItem(0, 0), 2, 1); + mainlayout->addItem(new TQSpacerItem(0, 0), 2, 1); } - maintqlayout->setRowStretch(2, 10); - maintqlayout->setColStretch(1, 10); + mainlayout->setRowStretch(2, 10); + mainlayout->setColStretch(1, 10); updateMask(); for (int n=0; n<ButtonTypeCount; n++) button[n] = 0; - addButtons(titletqlayout, options()->titleButtonsLeft()); - titletqlayout->addItem(titlebar_); + addButtons(titlelayout, options()->titleButtonsLeft()); + titlelayout->addItem(titlebar_); { - CrystalButton* lastbutton=addButtons(titletqlayout, options()->titleButtonsRight()); + CrystalButton* lastbutton=addButtons(titlelayout, options()->titleButtonsRight()); if (lastbutton)lastbutton->setFirstLast(false,true); } @@ -873,7 +873,7 @@ bool CrystalClient::isModalSystemNotification() return FALSE; } -CrystalButton* CrystalClient::addButtons(TQBoxLayout *tqlayout, const TQString& s) +CrystalButton* CrystalClient::addButtons(TQBoxLayout *layout, const TQString& s) { ButtonImage *bitmap; TQString tip; @@ -976,15 +976,15 @@ CrystalButton* CrystalClient::addButtons(TQBoxLayout *tqlayout, const TQString& break; case '_': // Spacer item - tqlayout->addSpacing(4); + layout->addSpacing(4); current=NULL; break; } if (current) { - tqlayout->addWidget(current); - if (tqlayout->findWidget(current)==0)current->setFirstLast(true,false); + layout->addWidget(current); + if (layout->findWidget(current)==0)current->setFirstLast(true,false); } lastone=current; } @@ -1041,17 +1041,17 @@ void CrystalClient::updateLayout() { if (FullMax) { - maintqlayout->setColSpacing(0,0); - maintqlayout->setColSpacing(2,0); + mainlayout->setColSpacing(0,0); + mainlayout->setColSpacing(2,0); }else{ - maintqlayout->setColSpacing(2,borderSpacing()); - maintqlayout->setColSpacing(0,borderSpacing()); + mainlayout->setColSpacing(2,borderSpacing()); + mainlayout->setColSpacing(0,borderSpacing()); } - maintqlayout->setRowSpacing(0, (FullMax||::factory->buttontheme==5)?0:1); + mainlayout->setRowSpacing(0, (FullMax||::factory->buttontheme==5)?0:1); for (int i=0;i<ButtonTypeCount;i++)if (button[i]) button[i]->resetSize(FullMax); - widget()->tqlayout()->activate(); + widget()->layout()->activate(); } int CrystalClient::borderSpacing() diff --git a/client/crystalclient.h b/client/crystalclient.h index 27c3629..b325602 100644 --- a/client/crystalclient.h +++ b/client/crystalclient.h @@ -166,7 +166,7 @@ public: void ClientWindows(Window* frame,Window* wrapper,Window* client); private: - CrystalButton* addButtons(TQBoxLayout* tqlayout, const TQString& buttons); + CrystalButton* addButtons(TQBoxLayout* layout, const TQString& buttons); void updateMask(); int borderSpacing(); void updateLayout(); @@ -195,8 +195,8 @@ private slots: void menuPopUp(); private: CrystalButton *button[ButtonTypeCount]; - TQGridLayout *maintqlayout; - TQHBoxLayout *titletqlayout; + TQGridLayout *mainlayout; + TQHBoxLayout *titlelayout; TQTimer timer; public: bool FullMax; |