diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/Applet.cpp plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/Applet.cpp
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/Applet.cpp 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/Applet.cpp 2010-02-13 02:16:12.000000000 +0000
@@ -160,7 +160,7 @@
connect(
this, SIGNAL(settingsChanged()),
- m_groupManager, SLOT(reconnect()));
+ this, SLOT(reconnectGroupManager()));
connect(
m_groupManager->rootGroup(), SIGNAL(itemAdded(AbstractGroupableItem*)),
@@ -173,6 +173,10 @@
connect(
m_groupManager->rootGroup(), SIGNAL(itemPositionChanged(AbstractGroupableItem*)),
this, SLOT(itemPositionChanged(AbstractGroupableItem*)));
+
+ connect(
+ m_groupManager, SIGNAL(reload()),
+ this, SLOT(reload()));
connect(
this, SIGNAL(settingsChanged()),
@@ -194,6 +198,10 @@
setMaximumSize(INT_MAX, INT_MAX);
}
+void Applet::reconnectGroupManager() {
+ m_groupManager->reconnect();
+}
+
void Applet::itemAdded(AbstractGroupableItem* groupableItem) {
if (m_tasksHash.contains(groupableItem)) {
qWarning("Applet::itemAdded: item already exist: %s", qPrintable(groupableItem->name()));
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/Applet.h plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/Applet.h
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/Applet.h 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/Applet.h 2010-02-13 02:16:12.000000000 +0000
@@ -129,7 +129,6 @@
void dragItem(TaskItem *item, QGraphicsSceneMouseEvent *event);
void dragTask(TaskManager::AbstractGroupableItem* task, QWidget *source);
void middleClickTask(TaskManager::AbstractGroupableItem* task);
- void reload();
void popup(const QPoint& pos, TaskManager::AbstractGroupableItem *task, QObject *receiver, const char *slot);
void popup(const TaskItem* item);
@@ -195,8 +194,10 @@
public slots:
void updateActiveIconIndex(TaskItem *item);
+ void reload();
private slots:
+ void reconnectGroupManager();
void updateFullLimit();
void widgetValueChanged();
void configuration();
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/TaskbarLayout.cpp plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/TaskbarLayout.cpp
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/TaskbarLayout.cpp 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/TaskbarLayout.cpp 2010-02-13 02:16:12.000000000 +0000
@@ -1005,9 +1005,14 @@
while (!m_items.isEmpty()) {
TaskbarItem *item = m_items.takeLast();
- disconnectItem(item->item);
- if (forceDeleteItems && !item->item->ownedByLayout()) {
- delete item->item;
+ TaskItem *titem = item->item;
+
+ if (titem != NULL) {
+ disconnectItem(titem);
+ if (forceDeleteItems && !titem->ownedByLayout()) {
+ delete titem;
+ item->item = NULL;
+ }
}
delete item;
}
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/Task.cpp plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/Task.cpp
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/Task.cpp 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/Task.cpp 2010-02-13 02:16:12.000000000 +0000
@@ -39,6 +39,11 @@
m_flags(0),
m_type(OtherItem),
m_icon() {
+
+ connect(
+ abstractItem, SIGNAL(destroyed(QObject*)),
+ this, SLOT(itemDestroyed()));
+
if (abstractItem->isGroupItem()) {
m_type = GroupItem;
m_group = static_cast(abstractItem);
@@ -68,24 +73,30 @@
}
}
-bool Task::isActive() {
- return m_abstractItem->isActive();
+void Task::itemDestroyed() {
+ m_abstractItem = NULL;
+ m_task = NULL;
+ m_group = NULL;
}
-bool Task::isOnCurrentDesktop() {
- return m_abstractItem->isOnCurrentDesktop();
+bool Task::isActive() const {
+ return m_abstractItem ? m_abstractItem->isActive() : false;
}
-bool Task::isOnAllDesktops() {
- return m_abstractItem->isOnAllDesktops();
+bool Task::isOnCurrentDesktop() const {
+ return m_abstractItem ? m_abstractItem->isOnCurrentDesktop() : false;
}
-bool Task::isMinimized() {
- return m_abstractItem->isMinimized();
+bool Task::isOnAllDesktops() const {
+ return m_abstractItem ? m_abstractItem->isOnAllDesktops() : false;
}
-bool Task::demandsAttention() {
- return m_abstractItem->demandsAttention();
+bool Task::isMinimized() const {
+ return m_abstractItem ? m_abstractItem->isMinimized() : false;
+}
+
+bool Task::demandsAttention() const {
+ return m_abstractItem ? m_abstractItem->demandsAttention() : false;
}
void Task::addMimeData(QMimeData* mimeData) {
@@ -100,16 +111,41 @@
}
}
-QString Task::text() {
+QString Task::text() const {
+ TaskManager::TaskPtr task;
+ TaskManager::StartupPtr startup;
+
switch (type()) {
- case StartupItem: return startup()->text();
- case TaskItem: return task()->visibleName();
- case GroupItem: return group()->name();
- default: return QString::null;
+ case StartupItem:
+ startup = this->startup();
+
+ if (startup) {
+ return startup->text();
+ }
+ break;
+
+ case TaskItem:
+ task = this->task();
+
+ if (task) {
+ return task->visibleName();
+ }
+ break;
+
+ case GroupItem:
+ if (m_group != NULL) {
+ return m_group->name();
+ }
+ break;
+
+ default:
+ break;
}
+
+ return QString::null;
}
-QString Task::description() {
+QString Task::description() const {
QString temp;
switch (type()) {
case StartupItem:
@@ -117,7 +153,7 @@
break;
case TaskItem:
case GroupItem:
- temp = m_abstractItem->isOnAllDesktops() ?
+ temp = isOnAllDesktops() ?
i18n("On all desktops") :
i18nc("Which virtual desktop a window is currently on", "On %1",
KWindowSystem::desktopName(m_abstractItem->desktop()));
@@ -128,32 +164,39 @@
return temp;
}
-int Task::desktop() {
+int Task::desktop() const {
return m_task ? m_task->task()->desktop() : -1;
}
-TaskManager::TaskPtr Task::task() {
+TaskManager::TaskPtr Task::task() const {
return m_task ? m_task->task() : TaskManager::TaskPtr();
}
-TaskManager::StartupPtr Task::startup() {
+TaskManager::StartupPtr Task::startup() const {
return m_task ? m_task->startup() : TaskManager::StartupPtr();
}
int Task::taskCount() const {
switch (type()) {
case GroupItem:
+ if (m_group == NULL) {
+ return 0;
+ }
+
return m_group->members().size();
default:
return 1;
}
}
-// XXX: sometimes when I close a window this is not called!
void Task::updateTask(::TaskManager::TaskChanges changes) {
// if (m_type != TaskItem && m_type != GroupItem)
// return;
+ if (!isValid()) {
+ return;
+ }
+
bool needsUpdate = false;
bool needsUpdateState = false;
TaskFlags t_flags = m_flags;
@@ -239,16 +282,27 @@
}
}
+// XXX: do I have to tell the applet about this?
void Task::setWindowTask(TaskManager::TaskItem* taskItem) {
m_type = TaskItem;
- if (m_task) {
+ if (m_task && m_task->task()) {
disconnect(m_task->task().constData(), 0, this, 0);
}
+
m_task = taskItem;
+ m_abstractItem = qobject_cast(taskItem);
+
+ if (m_abstractItem) {
+ connect(m_abstractItem, SIGNAL(destroyed(QObject*)), this, SLOT(itemDestroyed()));
+ }
+
connect(
m_task, SIGNAL(changed(::TaskManager::TaskChanges)),
this, SLOT(updateTask(::TaskManager::TaskChanges)));
+
updateTask(::TaskManager::EverythingChanged);
+
+ // for publishing the item geometry:
emit gotTask();
}
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/Task.h plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/Task.h
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/Task.h 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/Task.h 2010-02-13 02:16:12.000000000 +0000
@@ -57,11 +57,11 @@
Task(TaskManager::AbstractGroupableItem *abstractItem, QObject *parent);
~Task() {}
- bool isActive();
- bool isOnCurrentDesktop();
- bool isOnAllDesktops();
- bool isMinimized();
- bool demandsAttention();
+ bool isActive() const;
+ bool isOnCurrentDesktop() const;
+ bool isOnAllDesktops() const;
+ bool isMinimized() const;
+ bool demandsAttention() const;
enum ItemType {
OtherItem = 0,
@@ -71,21 +71,21 @@
};
void setIcon(const QIcon icon);
- QIcon icon() { return m_icon; }
const QIcon& icon() const { return m_icon; }
void setText(const QString &text);
- QString text();
- QString description();
- int desktop();
- TaskManager::TaskPtr task();
+ QString text() const;
+ QString description() const;
+ int desktop() const;
+ TaskManager::TaskPtr task() const;
TaskManager::AbstractGroupableItem *abstractItem() { return m_abstractItem; }
- TaskManager::GroupPtr group() { return m_group; }
- TaskManager::TaskItem *taskItem() { return m_task; }
- TaskManager::StartupPtr startup();
+ TaskManager::GroupPtr group() const { return m_group; }
+ TaskManager::TaskItem *taskItem() const { return m_task; }
+ TaskManager::StartupPtr startup() const;
TaskFlags flags() const { return m_flags; }
ItemType type() const { return m_type; }
void addMimeData(QMimeData* mimeData);
int taskCount() const;
+ bool isValid() const { return m_abstractItem != NULL; }
private:
void setWindowTask(TaskManager::TaskItem* taskItem);
@@ -101,11 +101,12 @@
private slots:
void updateTask(::TaskManager::TaskChanges changes);
void gotTaskPointer();
+ void itemDestroyed();
signals:
void updateToolTip();
void updateState();
- void updateIcon(QIcon icon);
+ void updateIcon(const QIcon& icon);
void update();
void gotTask();
};
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/TaskIcon.cpp plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/TaskIcon.cpp
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/TaskIcon.cpp 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/TaskIcon.cpp 2010-02-13 02:16:12.000000000 +0000
@@ -55,8 +55,7 @@
m_animationRepeater(new QTimer(this)),
m_currentAnimationDuration(0),
m_animation(0),
- m_progress(0.0),
- m_type(Other) {
+ m_progress(0.0) {
}
TaskIcon::~TaskIcon() {
@@ -109,7 +108,7 @@
}
}
-void TaskIcon::paint(QPainter *p, qreal hover) {
+void TaskIcon::paint(QPainter *p, qreal hover, bool isGroup) {
m_pixmap = m_icon.pixmap(size());
if (m_pixmap.isNull()) {
@@ -125,7 +124,7 @@
animationHover(hover);
}
- if (type() == TaskIcon::Group) {
+ if (isGroup) {
QPainter iconPainter(&m_pixmap);
QPixmap icon(KIcon("document-multiple").pixmap(
m_pixmap.width() * 0.45,
@@ -141,30 +140,16 @@
p->drawPixmap(m_pos, m_pixmap);
}
-void TaskIcon::setRect(QRectF rect) {
+void TaskIcon::setRect(const QRectF& rect) {
if (rect != m_rect) {
m_rect = rect;
- updateIcon(m_icon);
+ updatePos();
}
}
-void TaskIcon::setIcon(QIcon icon) {
- updateIcon(icon);
-}
-
-void TaskIcon::setType(IconType type) {
- m_type = type;
-}
-
-TaskIcon::IconType TaskIcon::type() const {
- return m_type;
-}
-
-void TaskIcon::updateIcon(QIcon icon) {
- if (!icon.isNull()) {
- m_icon = icon;
- m_highlightColor = dominantColor();
- }
+void TaskIcon::setIcon(const QIcon& icon) {
+ m_icon = icon;
+ m_highlightColor = dominantColor();
updatePos();
}
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/TaskIcon.h plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/TaskIcon.h
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/TaskIcon.h 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/TaskIcon.h 2010-02-13 02:16:12.000000000 +0000
@@ -40,24 +40,14 @@
TaskIcon(TaskItem *item);
~TaskIcon();
- enum IconType {
- Other = 0,
- Startup,
- Task,
- Group
- };
-
- void paint(QPainter *p, qreal hover);
- void setRect(QRectF geometry);
- void setIcon(QIcon icon);
- void setType(IconType type);
+ void paint(QPainter *p, qreal hover, bool isGroup);
+ void setRect(const QRectF& geometry);
QRgb highlightColor() const;
- IconType type() const;
qreal size() const;
QPointF pos() const { return m_pos; }
public slots:
- void updateIcon(QIcon icon);
+ void setIcon(const QIcon& icon);
void startStartupAnimation(int duration = 300);
void stopStartupAnimation();
@@ -81,9 +71,6 @@
qreal m_progress;
QPointF m_pos;
- // config
- IconType m_type;
-
void updatePos();
void animationHover(qreal hover);
void animationStartup(qreal progress);
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/TaskItem.cpp plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/TaskItem.cpp
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/applet/SmoothTasks/TaskItem.cpp 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/applet/SmoothTasks/TaskItem.cpp 2010-02-13 02:16:12.000000000 +0000
@@ -102,8 +102,8 @@
connect(m_task, SIGNAL(gotTask()), this, SLOT(publishIconGeometry()));
// icon
- connect(m_icon, SIGNAL(update()), this, SLOT(update()));
- connect(m_task, SIGNAL(updateIcon(QIcon)), m_icon, SLOT(updateIcon(QIcon)));
+ connect(m_icon, SIGNAL(update()), this, SLOT(update()));
+ connect(m_task, SIGNAL(updateIcon(const QIcon&)), m_icon, SLOT(setIcon(const QIcon&)));
updateState();
@@ -370,16 +370,26 @@
void TaskItem::publishIconGeometry() {
QRect iconRect(iconGeometry());
+ TaskManager::TaskPtr task;
+ TaskManager::GroupPtr group;
switch (m_task->type()) {
case Task::TaskItem:
- m_task->task()->publishIconGeometry(iconRect);
+ task = m_task->task();
+
+ if (task) {
+ task->publishIconGeometry(iconRect);
+ }
break;
case Task::GroupItem:
- foreach (TaskManager::AbstractGroupableItem *item, m_task->group()->members()) {
- TaskManager::TaskItem *task = qobject_cast(item);
- if (task) {
- task->task()->publishIconGeometry(iconRect);
+ group = m_task->group();
+
+ if (group) {
+ foreach (TaskManager::AbstractGroupableItem *item, group->members()) {
+ TaskManager::TaskItem *task = qobject_cast(item);
+ if (task) {
+ task->task()->publishIconGeometry(iconRect);
+ }
}
}
default:
@@ -442,6 +452,8 @@
}
void TaskItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
+ TaskManager::TaskPtr task;
+
switch (event->button()) {
case Qt::LeftButton:
m_applet->toolTip()->hide();
@@ -450,7 +462,11 @@
switch (m_task->type()) {
case Task::TaskItem:
- m_task->task()->activateRaiseOrIconify();
+ task = m_task->task();
+
+ if (task) {
+ task->activateRaiseOrIconify();
+ }
break;
case Task::GroupItem:
activateOrIconifyGroup();
@@ -475,8 +491,14 @@
}
void TaskItem::activateOrIconifyGroup() {
+ TaskManager::GroupPtr group = m_task->group();
+
+ if (group == NULL) {
+ return;
+ }
+
bool includesActive = false;
- TaskManager::ItemList items(m_task->group()->members());
+ TaskManager::ItemList items(group->members());
int iconified = 0;
foreach (TaskManager::AbstractGroupableItem *item, items) {
TaskManager::TaskItem *task = qobject_cast(item);
@@ -528,9 +550,15 @@
}
void TaskItem::activate() {
+ TaskManager::TaskPtr task;
+
switch (m_task->type()) {
case Task::TaskItem:
- m_task->task()->activate();
+ task = m_task->task();
+
+ if (task) {
+ task->activate();
+ }
break;
case Task::GroupItem:
m_applet->toolTip()->quickShow(this);
@@ -760,6 +788,7 @@
m_light->paint(p, lightBounds, pos, mouseIn, isVertical);
}
+
// draw text
if (m_applet->expandTasks()) {
drawText(p, left, top, right, bottom);
@@ -770,14 +799,7 @@
}
// draw icon
- if (m_task->type() == Task::GroupItem) {
- m_icon->setType(TaskIcon::Group);
- }
- else {
- m_icon->setType(TaskIcon::Other);
- }
- m_icon->paint(p, m_stateAnimation.hover());
-
+ m_icon->paint(p, m_stateAnimation.hover(), m_task->type() == Task::GroupItem);
}
void TaskItem::drawFrame(QPainter *p, Plasma::FrameSvg *frame) {
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/ChangeLog plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/ChangeLog
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/ChangeLog 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/ChangeLog 2010-02-13 02:16:12.000000000 +0000
@@ -1,3 +1,12 @@
+wip 2010-02-13:
+FIX: taskbar items where not updated on desktop switch under kde 4.4
+FIX: crash tasks where deleted but not yet removed from the layout (happend sometimes on desktop switch under kde 4.4)
+
+wip 2010-02-12:
+FIX: be more careful in TaskbarLayout::clear, hopefully fixes a crash, thanks to flupp
+Translations:
+ * updated polish translation, thanks to Maciej Warnecki
+
wip 2009-12-06:
NEW: also do middle click action on tooltip
FIX: chinese translation by Weng Xuetian (hurricanek)
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/debian/changelog plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/debian/changelog
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/debian/changelog 2009-12-06 09:52:37.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/debian/changelog 2010-02-13 11:06:52.000000000 +0000
@@ -1,3 +1,9 @@
+plasma-widget-smooth-tasks (wip20100213~karmic~ppa1) karmic; urgency=low
+
+ * Release of the wip-2010-02-13
+
+ -- Rog131 Sat, 13 Feb 2010 13:06:11 +0200
+
plasma-widget-smooth-tasks (wip20091206~karmic~ppa1) karmic; urgency=low
* Release of the wip-2009-12-06
diff -Nru plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/po/pl.po plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/po/pl.po
--- plasma-widget-smooth-tasks-wip20091206~karmic~ppa1/po/pl.po 2009-12-06 00:46:39.000000000 +0000
+++ plasma-widget-smooth-tasks-wip20100213~karmic~ppa1/po/pl.po 2010-02-13 02:16:12.000000000 +0000
@@ -1,12 +1,12 @@
# 2009-08-28
-# , 2009.
+# Maciej , 2010.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: grosser.meister.morti@gmx.net\n"
"POT-Creation-Date: 2009-11-07 00:47+0100\n"
-"PO-Revision-Date: 2009-11-25 23:29+0100\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2010-01-23 15:38+0100\n"
+"Last-Translator: Maciej \n"
"Language-Team: Polish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +80,7 @@
#: ../applet/SmoothTasks/Applet.cpp:678
msgid "Smooth"
-msgstr "Smooth"
+msgstr "Płynny"
#: ../applet/SmoothTasks/Applet.cpp:679
msgid "Plasma"
@@ -96,7 +96,7 @@
#: ../applet/SmoothTasks/Applet.cpp:685
msgid "Fixed Item Number per Row"
-msgstr "Ustalona liczba "
+msgstr "Ustalona liczba zadań na rząd"
#: ../applet/SmoothTasks/Applet.cpp:686
msgid "Limited Squeeze"
@@ -104,7 +104,7 @@
#: ../applet/SmoothTasks/Applet.cpp:687
msgid "Fixed Maximum Item Height"
-msgstr "Konkretna maksymalna wysokość ikon"
+msgstr "Maksymalna wysokość zadań"
#: ../applet/SmoothTasks/Applet.cpp:697
msgid "Active"
@@ -276,11 +276,10 @@
"not rotated. This only concerns vertical layouts, e.g. when you place the "
"taskbar at the left (or right) screen edge."
msgstr ""
-"Dla niektórych tematów pulpitu, ikony zadań mogą wyglądać lepiej gdy ramki "
-"je otaczające "
-"nie są obrócone. Tyczy się to jedynie pionowych pasków zadań, na przykład "
-"przy ułożeniu go "
-"po prawej lub lewej stronie ekranu."
+"Dla niektórych tematów pulpitu, ikony zadań mogą wyglądać lepiej gdy ramki\n"
+"je otaczające nie są obrócone. Tyczy się to jedynie pionowych pasków zadań, "
+"na przykład\n"
+"przy ułożeniu go po prawej lub lewej stronie ekranu."
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:321
#. i18n: ectx: property (text), widget (QCheckBox, dontRotateFrame)
@@ -297,12 +296,18 @@
"Using this option you can deactivate the usage of a different task item "
"frame on hover."
msgstr ""
+"Zazwyczaj, do zadań na które najechał kursor myszy\n"
+"wyświetlane jest inne obramowanie. Z tego powodu,\n "
+"efekt podświetlenia może wyglądać niepoprawnie w\n"
+"połączeniu z niektórymi tematami pulpitu. Ta opcja\n"
+"powoduje, że najechanie myszą na zadanie nie zmienia\n"
+"obramowania ikony programu na pasku zadań."
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:334
#. i18n: ectx: property (text), widget (QCheckBox, onlyLights)
#: rc.cpp:73
msgid "As &Only Hover Effect"
-msgstr ""
+msgstr "Tylko dla efektu &najechania"
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:344
#. i18n: ectx: property (text), widget (QCheckBox, textShadow)
@@ -318,6 +323,10 @@
"light color. When only an ugly (grayish) color could be extracted the color "
"specified above is used instead."
msgstr ""
+"Ta opcja powoduje, że do określenia koloru podświetlenia\n"
+"używana jest barwa będąca dominującą składową ikony\n"
+"danego zadania. Kiedy efektem będzie brzydka (szarawa)\n"
+"barwa, zamiast niej użyty będzie kolor ustalony powyżej."
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:360
#. i18n: ectx: property (text), widget (QCheckBox, lightColorFromIcon)
@@ -335,7 +344,9 @@
#. i18n: ectx: property (text), widget (QCheckBox, scrollSwitchTasks)
#: rc.cpp:88
msgid "Switch Tasks using &Wheel"
-msgstr "Przełączaj pomiędzy programami &kółkiem"
+msgstr ""
+"Przełączaj &kółkiem myszy\n"
+"pomiędzy programamami"
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:396
#. i18n: ectx: property (text), widget (QCheckBox, expandOnAttention)
@@ -434,7 +445,9 @@
#. i18n: ectx: property (text), widget (QLabel, rowAspectRatioLabel)
#: rc.cpp:141
msgid "Row &Aspect Ratio:"
-msgstr "Stosunek &wymiarów paska zadań:"
+msgstr ""
+"Wzajemny &stosunek\n"
+"wymiarów rzędów:"
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:597
#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, rowAspectRatio)
@@ -443,6 +456,8 @@
"The “By Taskbar Shape” layout uses this value to determine how many rows "
"should be created."
msgstr ""
+"Rozkład \"Według kształtu paska zadań\" używa tej wartości, by móc określić\n"
+"ile rzędów należy utworzyć."
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:619
#. i18n: ectx: property (text), widget (QLabel, itemsPerRowLabel)
@@ -457,6 +472,8 @@
"The “Fixed Item Number per Row” layout uses this amount to fill the rows "
"with task items."
msgstr ""
+"Rozkład \"Ustalona liczba zadań na rząd\" używa tej wartości, by wypełnić\n"
+"rzędy zadaniami."
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:648
#. i18n: ectx: property (text), widget (QLabel, itemHeightLabel)
@@ -471,12 +488,16 @@
"The “Fixed Maximum Item Height” layout uses this value to determine the size "
"of the task items."
msgstr ""
+"Rozkład \"Maksymalna szerokość zadań\" używa tej wartości do określenia\n"
+"rozmiaru zadań."
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:680
#. i18n: ectx: property (text), widget (QLabel, squeezeRatioLabel)
#: rc.cpp:162
msgid "Maximum &Squeeze Ratio:"
-msgstr "Maksymalny &współczynnik ściśnięcia:"
+msgstr ""
+"Współczynnik &maksymalnego\n"
+"dopuszczalnego ściśnięcia:"
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:693
#. i18n: ectx: property (toolTip), widget (QDoubleSpinBox, squeezeRatio)
@@ -485,17 +506,22 @@
"The “Limited Squeeze” layout tries not to squeeze items so that "
"squeezed item width / item width ≥ maximum squeeze ratio.
"
msgstr ""
-"Rozkład \"Ograniczone ściśnięcie\" próbuje tak ustawiać ikony zadań, by"
-"squeezed item width / item width ≥ maximum squeeze ratio.
"
+"Opcja ta jest wykorzystywana przy rozkładzie \"Częściowe ściśnięcie\".\n"
+"Współczynnik ten określa stopień dopuszczalnego maksymalnego\n"
+"ściśnięcia zadania, względem zadania nieściśniętego.\n"
+"(Iloraz szerokości ściśniętego zadania do szerokości nieściśniętego\n"
+"zadania nie może być mniejszy niż podana wartość współczynnika)"
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:715
#. i18n: ectx: property (toolTip), widget (QCheckBox, preferGrouping)
#: rc.cpp:168
-#, fuzzy
msgid ""
"Prefere grouping of tasks over the creation of new rows (currently only "
"supported by the Limited Squeeze” layout)."
-msgstr "!!!"
+msgstr ""
+"Opcja ta powoduje, że Smooth Tasks dąży do\n"
+"grupowania zadań, zamiast zwiększać liczbę rzędów.\n"
+"(obecnie wspierana jedynie przez opcję \"Częściowe ściśnięcie\")"
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:718
#. i18n: ectx: property (text), widget (QCheckBox, preferGrouping)
@@ -552,7 +578,6 @@
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:840
#. i18n: ectx: property (toolTip), widget (QComboBox, toolTipKind)
#: rc.cpp:199
-#, fuzzy
msgid ""
"None
\n"
"Don't display tool tips.
\n"
@@ -568,6 +593,20 @@
"features described above. Instead they integrate well with other applet's "
"tool tips and move animated across applets.
"
msgstr ""
+"Brak
\n"
+"Podglądy okien nie będą wyświetlane.
\n"
+"\n"
+"Płynny
\n"
+"Do wyświetlania podglądów okien zostaną użyte nowe, zaawansowane dymki. "
+"Można kliknąć na podgląd okna, by je pokazać, najechanie na podgląd kursorem "
+"powoduje jego wybór. Niestety, ten typ dymków nie jest jeszcze dobrze "
+"zintegrowany z powłoką pulpitu.
\n"
+"\n"
+"Natywny
\n"
+"Do wyświetlania podglądów okien zostaną użyte standradowe dymki. Nie "
+"posiadają one wyżej opisanych właściwości, ale dobrze integrują się z "
+"dymkami innych apletów systemu i zapewniają animowany ruch pomiędzy innymi "
+"apletami.
"
#. i18n: file: ../applet/SmoothTasks/Ui/Appearance.ui:862
#. i18n: ectx: property (suffix), widget (QSpinBox, tooltipMoveDuration)
@@ -643,7 +682,7 @@
#. i18n: ectx: property (text), widget (QCheckBox, onlyGroupWhenFull)
#: rc.cpp:251
msgid "Only when the taskbar is &full"
-msgstr "Tylko wtedy, gdy pasek zadań jest pełny"
+msgstr "Tylko gdy pasek zadań jest pełny"
#. i18n: file: ../applet/SmoothTasks/Ui/General.ui:98
#. i18n: ectx: property (text), widget (QLabel, sortingLabel)