gmane.comp.kde.cvs

Проверки государственной инспекции труда

Защита прав работодателя — 2012-05-26T03:14:12

6 июня в Москве (с 10.00 до 17.30)

ТРУДОВОЙ КОДЕКС РФ: ОБЗОР ТЕКУЩИХ ИЗМЕНЕНИЙ

Ведущий: Кандидат экономических наук, юрист с многолетним стажем работы в государственных
инспекциях труда г. Москвы и Санкт-Петербурга, в Роструде.

Место проведения: м. Бауманская, ул. Бауманская, д.6, БЦ "Виктория Плаза".
Стоимость участия  -  9000 рублей.
В стоимость входит методический материал, обеды, кофе-паузы, сертификат.
Иногородним участникам помогаем в бронировании гостиницы.

Регистрация по телефону:  +7 ( 4 9 5 ) 9 2 1 -3 0 -1 7


В программе обучения:

1. Проекты изменений Трудового кодекс

[websites/identity-kde-org] protected: Documentation typos--

Nicolás Alvarez — 2012-05-26T02:37:51

Git commit ce97f7bd34af0440f187b00f5cf916eac7854fb6 by Nicolás Alvarez.
Committed on 26/05/2012 at 04:37.
Pushed by nalvarez into branch 'master'.

Documentation typos--

M  +4    -4    protected/extensions/ldapsuite/SLdapModel.php
M  +5    -5    protected/extensions/ldapsuite/SLdapServer.php
M  +2    -2    protected/models/DeveloperApplication.php
M  +2    -2    protected/models/User.php

http://commits.kde.org/websites/identity-kde-org/ce97f7bd34af0440f187b00f5cf916eac7854fb6

diff --git a/protected/extensions/ldapsuite/SLdapModel.php b/protected/extensions/ldapsuite/SLdapModel.php
index df11ec5..fd4ef7f 100644
--- a/protected/extensions/ldapsuite/SLdapModel.php
+++ b/protected/extensions/ldapsuite/SLdapModel.php
< at >< at > -247,7 +247,7 < at >< at > abstract class SLdapModel extends CModel
 }
 
 /**
- * Creates a new DN for the current entry, based on an automaticaly generated RDN and the DN of a parent.
+ * Creates a new DN for the current entry, based on an automatically generated RDN and the DN of a parent.
  * < at >

[websites/identity-kde-org] protected: Code documentation: Add periods at the ends of sentences.

Nicolás Alvarez — 2012-05-26T02:13:32

Git commit eae7c4f216501ac5863bfd0619af45d3bbb6ce41 by Nicolás Alvarez.
Committed on 26/05/2012 at 04:12.
Pushed by nalvarez into branch 'master'.

Code documentation: Add periods at the ends of sentences.

This makes the docs generated by doxygen *much* more readable,
and avoids the entire doc comment from being parsed as the brief
description.

M  +1    -1    protected/controllers/GroupsController.php
M  +2    -2    protected/controllers/PeopleController.php
M  +5    -5    protected/extensions/ldapsuite/SLdapDataProvider.php
M  +41   -41   protected/extensions/ldapsuite/SLdapModel.php
M  +2    -2    protected/extensions/ldapsuite/SLdapSearchResult.php
M  +23   -23   protected/extensions/ldapsuite/SLdapServer.php
M  +0    -1    protected/models/LoginForm.php
M  +10   -10   protected/models/User.php
M  +2    -3    protected/widgets/NBreadcrumbs.php

http://commits.kde.org/websites/identity-kde-org/eae7c4f216501ac5863bfd0619af45d3bbb6ce41

diff --git a/protected/controllers/GroupsController.php b/protected/c

[kimtoy] /: add configure input method menu entry

Ni Hui — 2012-05-26T02:06:02

Git commit 41f3066cafb2ff2fec0d09dc857ace1a18f5815a by Ni Hui.
Committed on 26/05/2012 at 04:05.
Pushed by nihui into branch 'master'.

add configure input method menu entry

M  +9    -0    statusbar.cpp
M  +1    -0    statusbar.h

http://commits.kde.org/kimtoy/41f3066cafb2ff2fec0d09dc857ace1a18f5815a

diff --git a/statusbar.cpp b/statusbar.cpp
index 533738a..07a85a4 100644
--- a/statusbar.cpp
+++ b/statusbar.cpp
< at >< at > -103,6 +103,10 < at >< at > StatusBar::StatusBar()
     connect(trayiconModeAction, SIGNAL(toggled(bool)), this, SLOT(slotTrayiconModeToggled(bool)));
     m_tray->contextMenu()->addAction(trayiconModeAction);
 
+    KAction* configureIMAction = new KAction(KIcon("preferences-desktop-keyboard"), i18n("C&onfigure input method..."), this);
+    connect(configureIMAction, SIGNAL(triggered()), this, SLOT(slotConfigureIMTriggered()));
+    m_tray->contextMenu()->addAction(configureIMAction);
+
     KAction* prefAction = KStandardAction::preferences(this, SLOT(preferences()), 0);
     m_tray->contextMenu()->addA

[kimtoy] /: bump version to 1.9

Ni Hui — 2012-05-26T01:53:50

Git commit e76762cc68b425c4ea796f013cb81f169d2702d3 by Ni Hui.
Committed on 26/05/2012 at 03:53.
Pushed by nihui into branch 'master'.

bump version to 1.9

M  +1    -1    main.cpp

http://commits.kde.org/kimtoy/e76762cc68b425c4ea796f013cb81f169d2702d3

diff --git a/main.cpp b/main.cpp
index 8be8f25..d05e8b2 100644
--- a/main.cpp
+++ b/main.cpp
< at >< at > -29,7 +29,7 < at >< at >
 int main(int argc, char** argv)
 {
     KAboutData aboutData("kimtoy", 0, ki18n("KIMToy"),
-                         "1.8", ki18n("The KDE input method toy"),
+                         "1.9", ki18n("The KDE input method toy"),
                          KAboutData::License_GPL, ki18n("(c) 2011-2012, Ni Hui"));
     aboutData.addAuthor(ki18n("Ni Hui"), ki18n("Author"), "shuizhuyuanluo< at >126.com");
     aboutData.setProgramIconName("draw-freehand");

[kimtoy] /: grab mouse for execmenu

Ni Hui — 2012-05-26T01:51:49

Git commit 1ce407020a33deb5051628ff737f4a7968463120 by Ni Hui.
Committed on 26/05/2012 at 03:51.
Pushed by nihui into branch 'master'.

grab mouse for execmenu

M  +2    -1    statusbar.cpp

http://commits.kde.org/kimtoy/1ce407020a33deb5051628ff737f4a7968463120

diff --git a/statusbar.cpp b/statusbar.cpp
index 4664b2a..533738a 100644
--- a/statusbar.cpp
+++ b/statusbar.cpp
< at >< at > -391,7 +391,8 < at >< at > void StatusBar::slotExecMenu(const QStringList& actions)
         connect(action, SIGNAL(triggered()), menu, SLOT(close()));
         menu->addAction(action);
     }
-    menu->exec(QCursor::pos());
+    menu->popup(QCursor::pos());
+    menu->grabMouse();
 }
 
 void StatusBar::slotAutostartToggled(bool enable)

branches/work

Ian Wadham — 2012-05-26T01:13:58

SVN commit 1296695 by ianw:

Create a work branch for porting KGoldrunner to QGraphicsView, KGameRenderer and KgThemeProvider.

 A             kgoldrunner-qgv (directory)

www/areas/l10n/teams/fr/apps (silent)

Sébastien Renard — 2012-05-26T00:37:10

SVN commit 1296694 by renard:

SVN_SILENT automatic update

 M  +31 -32    pofiles.php  
 M  +38 -39    stats.php  
 M  +17 -17    translators.csv  
 M  +1243 -1243 translators.php  


http://websvn.kde.org/?view=rev&revision=1296694

l10n-kde4/ca/messages/extragear-accessibility

Antoni Bella Pérez — 2012-05-25T23:28:53

SVN commit 1296693 by bellaperez:

gui: Catalan works
  --  extragear-accessibility: Fixes and updates.

 M  +4 -3      sam.po  
 M  +6 -5      simon.po  
 M  +5 -4      simond.po  
 M  +4 -3      simondialogcommand.po  
 M  +481 -282  simonlib.po  


http://websvn.kde.org/?view=rev&revision=1296693

[kphotoalbum/remove-sqlbackend-take2] MainWindow: ZZZ--