[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/base/blazer
From: Ian Reinhart Geiser <geiseri () kde ! org>
Date: 2009-02-14 20:53:17
Message-ID: 1234644797.501263.990.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 926216 by geiseri:
tons of stylesheet tweaks. this will add a bit easier time to theme things.
M +1 -1 CMakeLists.txt
M +1 -1 INSTALL
M +3 -0 README
M +1 -0 applicationmenu.cpp
M +47 -16 black.css
M +1 -1 blazer.pro
M +2 -0 clock.cpp
M +0 -1 colorstyle.css
M +1 -0 desktopbutton.cpp
M +19 -11 launcher.cpp
M +1 -0 launcherbutton.cpp
M +1 -0 mediabutton.cpp
M +1 -0 mediamenu.cpp
M +1 -0 systemtray.cpp
M +3 -7 topbar.cpp
--- trunk/playground/base/blazer/CMakeLists.txt #926215:926216
@@ -44,5 +44,5 @@
install( FILES blazer.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES default.profile DESTINATION ${DATA_INSTALL_DIR}/blazer/profiles )
-install( FILES styles.css DESTINATION ${DATA_INSTALL_DIR}/blazer )
+install( FILES black.css colorstyle.css styles.css DESTINATION \
${DATA_INSTALL_DIR}/blazer )
--- trunk/playground/base/blazer/INSTALL #926215:926216
@@ -11,7 +11,7 @@
CMake:
> mkdir build
> cd build
-> cmake -DCMAKE_INSTALL_PREFIX=$(kde4-config --prefix) ../
+> cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$(kde4-config --prefix) \
../ > make
> make install
--- trunk/playground/base/blazer/README #926215:926216
@@ -76,6 +76,9 @@
18) Fix window struts to work better on dual screen setups.
19) On the fly switching between blazer and plasma for remote sessions.
20) Popup calendar on the clock.
+21) Group windows on the task bar.
+22) Manipulate window menu from the task bar.
+23) Add ability to set wallpaper.
Notes:
KDE Kiosk - http://lxr.kde.org/source/KDE/kdelibs/kdecore/doc/README.kiosk
--- trunk/playground/base/blazer/applicationmenu.cpp #926215:926216
@@ -29,6 +29,7 @@
ApplicationMenu::ApplicationMenu( QWidget *parent ) : \
KMenu(i18n("Applications"),parent) {
+ setObjectName("ApplicationMenu");
connect(this, SIGNAL(triggered(QAction*)), this, \
SLOT(slotActionTriggered(QAction*)));
connect( KSycoca::self(), SIGNAL(databaseChanged()), this, \
SLOT(slotRebuildMenus())); slotRebuildMenus();
--- trunk/playground/base/blazer/black.css #926215:926216
@@ -5,8 +5,8 @@
#SystemTray, #SystemTray * {
border: inset;
border-width: 2px;
- border-bottom-left-radius: 4px;
- border-bottom-right-radius: 4px;
+ border-bottom-left-radius: 6px;
+ border-bottom-right-radius: 6px;
background-color: black;
color: black;
}
@@ -34,37 +34,68 @@
}
#LauncherButton, #MediaButton {
- background-color: black;
- color: white;
+ border-bottom-right-radius: 9px;
+ border: 1px solid black;
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 black, \
stop: 1 lightgray ); + margin: 0px;
+ margin-right: 2px;
+
+ color: white;
+ padding-left: 4px;
+ padding-right: 8px;
}
+#MediaButton {
+ border-bottom-left-radius: 9px;
+}
#LauncherPopup {
border-width: 2px;
border-style: outset;
border-color: palette(midlight);
}
+#Pager {
+ border: inset;
+ border-width: 2px;
+ border-top-left-radius: 6px;
+ border-bottom-left-radius: 6px;
+ background-color: black;
+ color: black;
+}
+
#Pager > QAbstractButton {
background-color: black;
color: white;
}
-TaskItemButton *:enabled {
+#ShowDesktopButton {
+ border: flat;
+ border-width: 2px;
+ border-top-right-radius: 6px;
+ border-bottom-right-radius: 6px;
+ margin: 0px;
+ background-color: black;
+ color: black;
+}
+
+#ShowDesktopButton:checked {
+ border: inset;
+}
+
+TaskItemButton *:enabled {
color: white;
}
TaskItemButton {
- color: white;
- border-style: inset;
- border-width: 0px;
+ color: white;
+ border-style: inset;
+ border-width: 2px;
+ border-radius: 6px;
+ border-color: black;
+ margin-right: 2px;
+ margin-left: 2px;
}
-TaskItemButton:pressed {
- background-color: darkgray;
+TaskItemButton:checked {
+ background-color: black;
}
-
-TaskItemButton:hover {
- border-style: outset;
- border-width: 2px;
- border-color: gray;
-}
--- trunk/playground/base/blazer/blazer.pro #926215:926216
@@ -50,7 +50,7 @@
autostart.path = $$system(kde-config --prefix)/share/autostart
profile.files = default.profile
profile.path = $$system(kde4-config --install data)/blazer/profiles
-stylesheet.files = styles.css
+stylesheet.files = styles.css black.css colorstyle.css
stylesheet.path = $$system(kde4-config --install data)/blazer
INSTALLS += target \
autostart \
--- trunk/playground/base/blazer/clock.cpp #926215:926216
@@ -29,6 +29,8 @@
Clock::Clock(QWidget *parent ) : QFrame(parent)
{
+ setObjectName("Clock");
+
m_timer = new QTimer(this);
connect(m_timer, SIGNAL(timeout()), SLOT(updateTime()));
m_timer->start(5000); // signal every 5 seconds
--- trunk/playground/base/blazer/colorstyle.css #926215:926216
@@ -45,7 +45,6 @@
color: palette(highlighttext);
padding-left: 4px;
padding-right: 8px;
-
}
#LauncherPopup {
--- trunk/playground/base/blazer/desktopbutton.cpp #926215:926216
@@ -27,6 +27,7 @@
DesktopButton::DesktopButton( QWidget *parent ) : QToolButton(parent)
{
+ setObjectName("ShowDesktopButton");
setCheckable( true );
setChecked( false );
setIcon(KIcon("user-desktop"));
--- trunk/playground/base/blazer/launcher.cpp #926215:926216
@@ -37,6 +37,7 @@
#include <KDE/KDirWatch>
#include <KDE/KMimeType>
#include <KDE/KApplication>
+#include <KDE/KSycoca>
#include <QDir>
#include <QFileInfo>
@@ -101,6 +102,7 @@
QFrame(parent),
m_ui(new Ui::Launcher)
{
+ setObjectName("Launcher");
ApplicationMenu *menu = new ApplicationMenu(this);
connect( menu, SIGNAL(aboutToHide()), this, SIGNAL(popupDone()));
@@ -113,12 +115,12 @@
m_watcher = new KDirWatch(this);
foreach( QString profiles, KGlobal::dirs()->findDirs("data", \
"blazer/profiles/")) {
- kDebug() << "Watch" << profiles;
m_watcher->addDir( profiles );
}
connect(m_watcher, SIGNAL(created(QString)), this, SLOT(reloadTasks()));
connect(m_watcher, SIGNAL(deleted(QString)), this, SLOT(reloadTasks()));
connect(m_watcher, SIGNAL(dirty(QString)), this, SLOT(reloadTasks()));
+ connect( KSycoca::self(), SIGNAL(databaseChanged()), this, SLOT(reloadTasks()));
QTimer::singleShot( 0, this, SLOT(setupTasks()));
QTimer::singleShot( 0, this, SLOT(setupShortcuts()));
@@ -149,16 +151,21 @@
desktopFilePath = service->entryPath();
}
if( desktopFilePath.isEmpty() )
- return;
+ {
+ button->hide();
+ }
+ else
+ {
+ KDesktopFile desktopFile( desktopFilePath );
+ button->setText( desktopFile.readGenericName() );
+ button->setDescription( desktopFile.readName() );
+ button->setIcon( KIcon( desktopFile.readIcon() ));
+ button->setDesktopFilePath( desktopFilePath );
- KDesktopFile desktopFile( desktopFilePath );
- button->setText( desktopFile.readGenericName() );
- button->setDescription( desktopFile.readName() );
- button->setIcon( KIcon( desktopFile.readIcon() ));
- button->setDesktopFilePath( desktopFilePath );
+ connect( button, SIGNAL(activated(int)), this, SIGNAL(popupDone(int)));
- connect( button, SIGNAL(activated(int)), this, SIGNAL(popupDone(int)));
-
+ button->show();
+ }
}
void Launcher::setupShortcuts()
@@ -170,7 +177,8 @@
configureButtonFromDesktopFile( m_ui->settings, QLatin1String("systemsettings") \
);
KConfigGroup paths = KGlobal::config()->group(QLatin1String("Paths"));
- QString documentsDirectory = paths.readEntry( QLatin1String("Documents"), \
QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation) ); + \
QString documentsDirectory = paths.readEntry( QLatin1String("Documents"), + \
QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation) ); \
m_ui->documents->setIcon( KIcon("folder.png") ); \
m_ui->documents->setDesktopStartUrl( documentsDirectory );
connect( m_ui->documents, SIGNAL(activated(int)), this, SIGNAL(popupDone(int)));
@@ -180,7 +188,7 @@
void Launcher::setupTasks()
{
bool isEmpty = true;
- foreach( QString profiles, KGlobal::dirs()->findDirs("data", \
"blazer/profiles/")) + foreach( QString profiles, \
KGlobal::dirs()->findDirs("data", "blazer/profiles/") ) {
QDir profilesDir( profiles );
foreach( QFileInfo profileInfo, profilesDir.entryInfoList( QStringList() << \
"*.profile", QDir::Files, QDir::Name ) )
--- trunk/playground/base/blazer/launcherbutton.cpp #926215:926216
@@ -30,6 +30,7 @@
LauncherButton::LauncherButton( QWidget *parent ) : KPushButton(parent)
{
+ setObjectName("LauncherButton");
setIcon(KIcon("start-here-kde"));
setText(i18n("Computer"));
--- trunk/playground/base/blazer/mediabutton.cpp #926215:926216
@@ -25,6 +25,7 @@
MediaButton::MediaButton( QWidget *parent ) : KPushButton(parent)
{
+ setObjectName("MediaButton");
setIcon(KIcon("drive-removable-media"));
setText(i18n("Media"));
MediaMenu *menu = new MediaMenu(this);
--- trunk/playground/base/blazer/mediamenu.cpp #926215:926216
@@ -39,6 +39,7 @@
MediaMenu::MediaMenu( QWidget *parent ) : KMenu(i18n("Media"),parent)
{
+ setObjectName("MediaMenu");
connect(Solid::DeviceNotifier::instance(), SIGNAL(deviceAdded(const QString&)),
this, SLOT(slotRebuildMenus()));
connect(Solid::DeviceNotifier::instance(), SIGNAL(deviceRemoved(const \
QString&)),
--- trunk/playground/base/blazer/systemtray.cpp #926215:926216
@@ -40,6 +40,7 @@
SystemTray::SystemTray(QWidget *parent) : QFrame(parent)
{
+ setObjectName("SystemTray");
m_layout = new QHBoxLayout(this);
m_layout->setDirection(QBoxLayout::RightToLeft);
m_layout->setContentsMargins(0, 0, 0, 0);
--- trunk/playground/base/blazer/topbar.cpp #926215:926216
@@ -43,16 +43,11 @@
setObjectName("TopPanel");
m_clock = new Clock(this);
- m_clock->setObjectName("Clock");
-
m_tray = new SystemTray(this);
- m_tray->setObjectName("SystemTray");
m_button = new LauncherButton(this);
- m_button->setObjectName("LauncherButton");
m_media = new MediaButton(this);
- m_media->setObjectName("MediaButton");
m_launcher = new LauncherBar(this);
@@ -60,6 +55,7 @@
layout->addWidget(m_button);
layout->addWidget(m_media);
layout->addWidget(m_launcher, 1);
+ layout->addWidget( new QWidget(this), 1); // give some space here...
layout->addWidget(m_tray);
layout->addWidget(m_clock);
layout->setSpacing(0);
@@ -100,8 +96,8 @@
layout->addWidget(spacer, 1);
layout->addWidget(m_pager);
- layout->setSpacing(1);
- layout->setMargin(1);
+ layout->setSpacing(0);
+ layout->setMargin(0);
KWindowSystem::setType( winId(), NET::Dock );
KWindowSystem::setOnAllDesktops( winId(), true );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic