yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reindentation urge.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=311876
This commit is contained in:
Luciano Montanaro 2004-05-16 18:27:26 +00:00
parent 5eef563549
commit 3665879171
1 changed files with 76 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
clients/b2/b2client.cpp
View file

@ -374,76 +374,78 @@ void B2Client::addButtons(const QString& s, const QString tips[],
for (unsigned int i = 0; i < s.length(); i++) { for (unsigned int i = 0; i < s.length(); i++) {
switch (s[i].latin1()) { switch (s[i].latin1()) {
case 'M': // Menu button case 'M': // Menu button
if (!button[BtnMenu]) { if (!button[BtnMenu]) {
button[BtnMenu] = new B2Button(this, tb, tips[BtnMenu], LeftButton|RightButton); button[BtnMenu] = new B2Button(this, tb, tips[BtnMenu],
button[BtnMenu]->setPixmaps(P_MENU); LeftButton | RightButton);
button[BtnMenu]->setUseMiniIcon(); button[BtnMenu]->setPixmaps(P_MENU);
connect(button[BtnMenu], SIGNAL(clicked()), button[BtnMenu]->setUseMiniIcon();
this, SLOT(menuButtonPressed())); connect(button[BtnMenu], SIGNAL(clicked()),
titleLayout->addWidget(button[BtnMenu]); this, SLOT(menuButtonPressed()));
} titleLayout->addWidget(button[BtnMenu]);
break; }
case 'S': // Sticky button break;
if (!button[BtnSticky]) { case 'S': // Sticky button
button[BtnSticky] = new B2Button(this, tb, tips[BtnSticky]); if (!button[BtnSticky]) {
button[BtnSticky]->setPixmaps(P_PINUP); button[BtnSticky] = new B2Button(this, tb, tips[BtnSticky]);
button[BtnSticky]->setToggle(); button[BtnSticky]->setPixmaps(P_PINUP);
button[BtnSticky]->setDown(isOnAllDesktops()); button[BtnSticky]->setToggle();
connect(button[BtnSticky], SIGNAL(clicked()), button[BtnSticky]->setDown(isOnAllDesktops());
this, SLOT(toggleOnAllDesktops())); connect(button[BtnSticky], SIGNAL(clicked()),
titleLayout->addWidget(button[BtnSticky]); this, SLOT(toggleOnAllDesktops()));
} titleLayout->addWidget(button[BtnSticky]);
break; }
case 'H': // Help button break;
if (providesContextHelp() && (!button[BtnHelp])) { case 'H': // Help button
button[BtnHelp] = new B2Button(this, tb, tips[BtnHelp]); if (providesContextHelp() && (!button[BtnHelp])) {
button[BtnHelp]->setPixmaps(P_HELP); button[BtnHelp] = new B2Button(this, tb, tips[BtnHelp]);
connect(button[BtnHelp], SIGNAL(clicked()), button[BtnHelp]->setPixmaps(P_HELP);
this, SLOT(showContextHelp())); connect(button[BtnHelp], SIGNAL(clicked()),
titleLayout->addWidget(button[BtnHelp]); this, SLOT(showContextHelp()));
} titleLayout->addWidget(button[BtnHelp]);
break; }
case 'I': // Minimize button break;
if (isMinimizable() && (!button[BtnIconify])) { case 'I': // Minimize button
button[BtnIconify]= new B2Button(this, tb,tips[BtnIconify]); if (isMinimizable() && (!button[BtnIconify])) {
button[BtnIconify]->setPixmaps(P_ICONIFY); button[BtnIconify]= new B2Button(this, tb,tips[BtnIconify]);
connect(button[BtnIconify], SIGNAL(clicked()), button[BtnIconify]->setPixmaps(P_ICONIFY);
this, SLOT(minimize())); connect(button[BtnIconify], SIGNAL(clicked()),
titleLayout->addWidget(button[BtnIconify]); this, SLOT(minimize()));
} titleLayout->addWidget(button[BtnIconify]);
break; }
case 'A': // Maximize button break;
if (isMaximizable() && (!button[BtnMax])) { case 'A': // Maximize button
button[BtnMax]= new B2Button(this, tb, tips[BtnMax], LeftButton|MidButton|RightButton); if (isMaximizable() && (!button[BtnMax])) {
button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ? button[BtnMax]= new B2Button(this, tb, tips[BtnMax],
P_NORMALIZE : P_MAX); LeftButton | MidButton | RightButton);
connect(button[BtnMax], SIGNAL(clicked()), button[BtnMax]->setPixmaps(maximizeMode() == MaximizeFull ?
this, SLOT(maxButtonClicked())); P_NORMALIZE : P_MAX);
titleLayout->addWidget(button[BtnMax]); connect(button[BtnMax], SIGNAL(clicked()),
} this, SLOT(maxButtonClicked()));
break; titleLayout->addWidget(button[BtnMax]);
case 'X': // Close button }
if (isCloseable() && !button[BtnClose]) { break;
button[BtnClose]= new B2Button(this, tb, tips[BtnClose]); case 'X': // Close button
button[BtnClose]->setPixmaps(P_CLOSE); if (isCloseable() && !button[BtnClose]) {
connect(button[BtnClose], SIGNAL(clicked()), button[BtnClose]= new B2Button(this, tb, tips[BtnClose]);
this, SLOT(closeWindow())); button[BtnClose]->setPixmaps(P_CLOSE);
titleLayout->addWidget(button[BtnClose]); connect(button[BtnClose], SIGNAL(clicked()),
} this, SLOT(closeWindow()));
break; titleLayout->addWidget(button[BtnClose]);
case 'L': // Shade button }
if (isShadeable() && !button[BtnShade]) { break;
button[BtnShade]= new B2Button(this, tb, tips[BtnShade]); case 'L': // Shade button
button[BtnShade]->setPixmaps(P_SHADE); if (isShadeable() && !button[BtnShade]) {
connect(button[BtnShade], SIGNAL(clicked()), button[BtnShade]= new B2Button(this, tb, tips[BtnShade]);
this, SLOT(shadeButtonClicked())); button[BtnShade]->setPixmaps(P_SHADE);
titleLayout->addWidget(button[BtnShade]); connect(button[BtnShade], SIGNAL(clicked()),
} this, SLOT(shadeButtonClicked()));
break; titleLayout->addWidget(button[BtnShade]);
case '_': // Additional spacing }
titleLayout->addSpacing(4); break;
break; case '_': // Additional spacing
titleLayout->addSpacing(4);
break;
} }
} }
} }
@ -460,7 +462,7 @@ void B2Client::iconChange()
void B2Client::calcHiddenButtons() void B2Client::calcHiddenButtons()
{ {
// Hide buttons in this order: // Hide buttons in this order:
// Sticky, Help, Maximize, Minimize, Close, Menu // Shade, Sticky, Help, Maximize, Minimize, Close, Menu
B2Button* btnArray[] = { B2Button* btnArray[] = {
button[BtnShade], button[BtnSticky], button[BtnHelp], button[BtnShade], button[BtnSticky], button[BtnHelp],
button[BtnMax], button[BtnIconify], button[BtnClose], button[BtnMenu] button[BtnMax], button[BtnIconify], button[BtnClose], button[BtnMenu]
@ -958,11 +960,11 @@ void B2Client::positionButtons()
QString cap = caption(); QString cap = caption();
if (cap.length() < 5) // make sure the titlebar has sufficiently wide if (cap.length() < 5) // make sure the titlebar has sufficiently wide
cap = "XXXXX"; // area for dragging the window cap = "XXXXX"; // area for dragging the window
int textLen = fm.width( cap ); int textLen = fm.width(cap);
QRect t = titlebar->captionSpacer->geometry(); QRect t = titlebar->captionSpacer->geometry();
int titleWidth = titlebar->width() - t.width() + textLen+2; int titleWidth = titlebar->width() - t.width() + textLen + 2;
if (titleWidth > width()) titleWidth=width(); if (titleWidth > width()) titleWidth = width();
titlebar->resize(titleWidth, buttonSize + 4); titlebar->resize(titleWidth, buttonSize + 4);
titlebar->move(bar_x_ofs, 0); titlebar->move(bar_x_ofs, 0);