removed UBClockPalette and UBPageNumberPalette. Those palettes are no more used

preferencesAboutTextFull
Claudio Valerio 13 years ago
parent c035333f28
commit b20fb9e47a
  1. 6
      src/board/UBBoardPaletteManager.cpp
  2. 84
      src/gui/UBClockPalette.cpp
  3. 60
      src/gui/UBPageNumberPalette.cpp
  4. 51
      src/gui/UBPageNumberPalette.h
  5. 4
      src/gui/gui.pri

@ -25,9 +25,7 @@
#include "gui/UBMainWindow.h" #include "gui/UBMainWindow.h"
#include "gui/UBStylusPalette.h" #include "gui/UBStylusPalette.h"
#include "gui/UBClockPalette.h"
#include "gui/UBKeyboardPalette.h" #include "gui/UBKeyboardPalette.h"
#include "gui/UBPageNumberPalette.h"
#include "gui/UBToolWidget.h" #include "gui/UBToolWidget.h"
#include "gui/UBZoomPalette.h" #include "gui/UBZoomPalette.h"
#include "gui/UBActionPalette.h" #include "gui/UBActionPalette.h"
@ -138,10 +136,6 @@ void UBBoardPaletteManager::setupPalettes()
mZoomPalette = new UBZoomPalette(mContainer); mZoomPalette = new UBZoomPalette(mContainer);
//mClockPalette->addAssociatedPalette(mKeyboardPalette);
//mKeyboardPalette->addAssociatedPalette(mClockPalette);
QList<QAction*> backgroundsActions; QList<QAction*> backgroundsActions;
backgroundsActions << UBApplication::mainWindow->actionPlainLightBackground; backgroundsActions << UBApplication::mainWindow->actionPlainLightBackground;

@ -1,84 +0,0 @@
/*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui>
#include "UBClockPalette.h"
#include "core/memcheck.h"
UBClockPalette::UBClockPalette(QWidget *parent)
: UBFloatingPalette(Qt::TopRightCorner, parent)
, mTimeLabel(0)
{
setLayout(new QHBoxLayout());
mTimeLabel = new QLabel(parent);
mTimeLabel->setStyleSheet(QString("QLabel {color: white; background-color: transparent; font-family: Arial; font-weight: bold; font-size: 20px}"));
layout()->setContentsMargins(radius() + 15, 4, radius() + 15, 4);
layout()->addWidget(mTimeLabel);
mTimeFormat = QLocale::system().timeFormat(QLocale::ShortFormat);
//strip seconds
mTimeFormat = mTimeFormat.remove(":ss");
mTimeFormat = mTimeFormat.remove(":s");
}
UBClockPalette::~UBClockPalette()
{
// NOOP
}
int UBClockPalette::radius()
{
return 10;
}
void UBClockPalette::updateTime()
{
if (mTimeLabel)
{
mTimeLabel->setText(QLocale::system().toString (QTime::currentTime(), mTimeFormat));
}
adjustSizeAndPosition();
}
void UBClockPalette::timerEvent(QTimerEvent *event)
{
Q_UNUSED(event);
updateTime();
}
void UBClockPalette::showEvent ( QShowEvent * event )
{
Q_UNUSED(event);
updateTime();
mTimerID = startTimer(1000);
}
void UBClockPalette::hideEvent ( QShowEvent * event )
{
Q_UNUSED(event);
killTimer(mTimerID);
}

@ -1,60 +0,0 @@
/*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <QtGui>
#include "UBPageNumberPalette.h"
#include "core/memcheck.h"
UBPageNumberPalette::UBPageNumberPalette(QWidget *parent)
: UBFloatingPalette(Qt::BottomRightCorner, parent)
{
mLayout = new QHBoxLayout(this);
mButton = new QPushButton(parent);
mButton->setStyleSheet(QString("QPushButton { color: white; background-color: transparent; border: none; font-family: Arial; font-weight: bold; font-size: 20px }"));
mButton->setFocusPolicy(Qt::NoFocus);
connect(mButton, SIGNAL(clicked(bool)), this, SLOT(buttonClicked(bool)));
mLayout->setContentsMargins(radius() + 15, 4, radius() + 15, 4);
mLayout->addWidget(mButton);
setPageNumber(0, 0);
}
UBPageNumberPalette::~UBPageNumberPalette()
{
delete mButton;
delete mLayout;
}
void UBPageNumberPalette::buttonClicked(bool checked)
{
Q_UNUSED(checked);
emit clicked();
}
int UBPageNumberPalette::radius()
{
return 10;
}
void UBPageNumberPalette::setPageNumber(int current, int total)
{
mButton->setText(QString("%1 / %2").arg(current).arg(total));
adjustSizeAndPosition();
}

@ -1,51 +0,0 @@
/*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef UBPAGENUMBERPALLETTE_H_
#define UBPAGENUMBERPALLETTE_H_
class QHBoxLayout;
class QPushButton;
#include "UBFloatingPalette.h"
class UBPageNumberPalette : public UBFloatingPalette
{
Q_OBJECT;
public:
UBPageNumberPalette(QWidget *parent = 0);
virtual ~UBPageNumberPalette();
protected:
int radius();
private:
QHBoxLayout *mLayout;
QPushButton *mButton;
private slots:
void buttonClicked(bool checked);
public slots:
void setPageNumber(int current, int total);
signals:
void clicked();
};
#endif /* UBPAGENUMBERPALLETTE_H_ */

@ -4,8 +4,6 @@ HEADERS += src/gui/UBThumbnailView.h \
src/gui/UBToolbarButtonGroup.h \ src/gui/UBToolbarButtonGroup.h \
src/gui/UBStylusPalette.h \ src/gui/UBStylusPalette.h \
src/gui/UBIconButton.h \ src/gui/UBIconButton.h \
src/gui/UBClockPalette.h \
src/gui/UBPageNumberPalette.h \
src/gui/UBThumbnailWidget.h \ src/gui/UBThumbnailWidget.h \
src/gui/UBCircleFrame.h \ src/gui/UBCircleFrame.h \
src/gui/UBColorPicker.h \ src/gui/UBColorPicker.h \
@ -50,8 +48,6 @@ SOURCES += src/gui/UBThumbnailView.cpp \
src/gui/UBToolbarButtonGroup.cpp \ src/gui/UBToolbarButtonGroup.cpp \
src/gui/UBStylusPalette.cpp \ src/gui/UBStylusPalette.cpp \
src/gui/UBIconButton.cpp \ src/gui/UBIconButton.cpp \
src/gui/UBClockPalette.cpp \
src/gui/UBPageNumberPalette.cpp \
src/gui/UBThumbnailWidget.cpp \ src/gui/UBThumbnailWidget.cpp \
src/gui/UBCircleFrame.cpp \ src/gui/UBCircleFrame.cpp \
src/gui/UBColorPicker.cpp \ src/gui/UBColorPicker.cpp \

Loading…
Cancel
Save