http://blog.gmane.org/gmane.comp.kde.cvs hourly 1 1901-01-01T00:00+00:00 http://gmane.org/img/gmane-25t.png http://gmane.org http://permalink.gmane.org/gmane.comp.kde.cvs/1141339 <pre>Git commit 3d07655140cda87d33424cd6014add1cce6b1fb0 by Hugo Pereira Da Costa. Committed on 24/05/2012 at 18:32. Pushed by hpereiradacosta into branch 'gtk3'. Merge branch 'gtk3-1.0-fixes' into gtk3 M +16 -0 src/animations/oxygenanimations.cpp http://commits.kde.org/oxygen-gtk/3d07655140cda87d33424cd6014add1cce6b1fb0 </pre> Hugo Pereira Da Costa 2012-05-24T16:32:26 http://permalink.gmane.org/gmane.comp.kde.cvs/1141338 <pre>Git commit a4e89f6debe7476ced6a5d1a1b071f5f5069a6a7 by Hugo Pereira Da Costa. Committed on 24/05/2012 at 16:56. Pushed by hpereiradacosta into branch 'gtk3'. use gtk_cell_view_set_background_rgba instead of gtk_cell_view_set_background_color to avoid warning when compiling against Gtk-3.5 M +4 -1 src/animations/oxygencomboboxdata.cpp http://commits.kde.org/oxygen-gtk/a4e89f6debe7476ced6a5d1a1b071f5f5069a6a7 diff --git a/src/animations/oxygencomboboxdata.cpp b/src/animations/oxygencomboboxdata.cpp index a28c146..cec52f8 100644 --- a/src/animations/oxygencomboboxdata.cpp +++ b/src/animations/oxygencomboboxdata.cpp &lt; at &gt;&lt; at &gt; -122,7 +122,10 &lt; at &gt;&lt; at &gt; namespace Oxygen { // change background color if( _cell._widget ) - { gtk_cell_view_set_background_color( GTK_CELL_VIEW( _cell._widget ), 0L ); } + { + const GdkRGBA color = { 0, 0, 0, 0 }; + gtk_cell_view_set_background_rgba( GTK_CELL_VIEW( _cell._widget ), &amp;color ); + } } //________________________________________________________________________________ </pre> Hugo Pereira Da Costa 2012-05-24T16:32:26 http://permalink.gmane.org/gmane.comp.kde.cvs/1141337 <pre>Git commit 7ef1874427718925ae7fc8a29572cf6088ea337e by Hugo Pereira Da Costa. Committed on 24/05/2012 at 17:44. Pushed by hpereiradacosta into branch 'gtk3'. explicitely call style_updated() for GtkRange widget, in size-allocation hook. Somehow, this method is not called anymore as soon as we (oxygen-gtk) install our hooks. This in turn prevents some settings to be properly initialized, such as the slider length, or the arrows for scrollbars. CCBUG: 299813 M +16 -0 src/animations/oxygenanimations.cpp http://commits.kde.org/oxygen-gtk/7ef1874427718925ae7fc8a29572cf6088ea337e diff --git a/src/animations/oxygenanimations.cpp b/src/animations/oxygenanimations.cpp index 4c06baf..1349ce8 100644 --- a/src/animations/oxygenanimations.cpp +++ b/src/animations/oxygenanimations.cpp &lt; at &gt;&lt; at &gt; -231,6 +231,22 &lt; at &gt;&lt; at &gt; namespace Oxygen return TRUE; } + #if GTK_CHECK_VERSION( 3, 5, 0 ) + /* + HACK: Somehow, style_updated method for GtkRange widgets is not called anymore + as soon as we (oxygen-gtk) install our hooks. This prevents some settings to be + properly initialized, such as the slider length, or the arrows for scrollbars. + Therefore we explicitly call the styleUpdated function ourselves. + */ + if( GTK_IS_RANGE( widget ) ) + { + // get class + GtkWidgetClass* widgetClass = GTK_WIDGET_GET_CLASS( widget ); + if( widgetClass &amp;&amp; widgetClass-&gt;style_updated ) + { (*widgetClass-&gt;style_updated)(widget); } + } + #endif + // groupbox labels #if ENABLE_GROUPBOX_HACK if( static_cast&lt;Animations*&gt;( data )-&gt;groupBoxLabelEngine().contains( widget ) ) </pre> Hugo Pereira Da Costa 2012-05-24T16:32:26 http://permalink.gmane.org/gmane.comp.kde.cvs/1141336 <pre> it looks at the desktop file name, that is words.desktop (while the executable is calligrawords) </pre> Marco Martin 2012-05-24T16:29:06 http://permalink.gmane.org/gmane.comp.kde.cvs/1141335 <pre>Git commit 2519bfca0b116d13088f3e9ca8327aadd00bc604 by Marco Martin. Committed on 24/05/2012 at 18:24. Pushed by mart into branch 'master'. hide search field when in filesystem mode M +1 -0 applications/filebrowser/package/contents/ui/Browser.qml http://commits.kde.org/plasma-mobile/2519bfca0b116d13088f3e9ca8327aadd00bc604 diff --git a/applications/filebrowser/package/contents/ui/Browser.qml b/applications/filebrowser/package/contents/ui/Browser.qml index 7c23998..f35647d 100644 --- a/applications/filebrowser/package/contents/ui/Browser.qml +++ b/applications/filebrowser/package/contents/ui/Browser.qml &lt; at &gt;&lt; at &gt; -93,6 +93,7 &lt; at &gt;&lt; at &gt; PlasmaComponents.Page { MobileComponents.ViewSearch { id: searchBox anchors.centerIn: parent + visible: fileBrowserRoot.model == metadataModel onSearchQueryChanged: { if (searchQuery.length &gt; 3) { </pre> Marco Martin 2012-05-24T16:26:04 http://permalink.gmane.org/gmane.comp.kde.cvs/1141334 <pre>config/1d046e266ec7322b00a04f1e02a764e apps=kwalletmanager,dolphinsu,nepomukbackup,flashplayer,qt4config,kmix,blu +apps=kwalletmanager,dolphinsu,nepomukbackup,flashplayer,qt4config,kmix,bl workoperator,org.kde.mobilenetworkstatus,org.kde.sharelikeconnect,org.kde.w ebdashboard,org.kde.active.connman,org.kde.locationchooser,org.kde.networkm That looks like a weird change. Our apps are named calligrawords rather than words </pre> C. Boemann 2012-05-24T16:16:07 http://permalink.gmane.org/gmane.comp.kde.cvs/1141333 <pre>Git commit dadbda42a30d950e6f658d39aa315a01a5934199 by Jekyll Wu. Committed on 24/05/2012 at 18:06. Pushed by jekyllwu into branch 'master'. Use KService to lookup the library name of konsolepart See https://git.reviewboard.kde.org/r/105028/ M +8 -1 src/konsolepanel.cpp http://commits.kde.org/konversation/dadbda42a30d950e6f658d39aa315a01a5934199 diff --git a/src/konsolepanel.cpp b/src/konsolepanel.cpp index 14b32cc..560f066 100644 --- a/src/konsolepanel.cpp +++ b/src/konsolepanel.cpp &lt; at &gt;&lt; at &gt; -18,6 +18,7 &lt; at &gt;&lt; at &gt; #include &lt;QLabel&gt; #include &lt;KApplication&gt; +#include &lt;KService&gt; #include &lt;KHBox&gt; #include &lt;kde_terminal_interface.h&gt; &lt; at &gt;&lt; at &gt; -44,7 +45,13 &lt; at &gt;&lt; at &gt; KonsolePanel::KonsolePanel(QWidget *p) : ChatWindow( p ), k_part (0) m_konsoleLabel = new QLabel(headerWidget); m_konsoleLabel-&gt;setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum)); - KPluginFactory* fact = KPluginLoader("libkonsolepart").factory(); + KPluginFactory* fact = 0; + KService::Ptr service = KService::serviceByDesktopName("konsolepart"); + if( service ) + { + fact = KPluginLoader(service-&gt;library()).factory(); + } + if (!fact) return; k_part = fact-&gt;create&lt;KParts::ReadOnlyPart&gt;(m_headerSplitter); </pre> Jekyll Wu 2012-05-24T16:14:16 http://permalink.gmane.org/gmane.comp.kde.cvs/1141332 <pre>Git commit 1d046e266ec7322b00a04f1e02a764e89ec4a25a by Marco Martin. Committed on 24/05/2012 at 18:09. Pushed by mart into branch 'master'. fix calligra blacklisting M +1 -1 appconfig/active-blacklistrc http://commits.kde.org/plasma-mobile-config/1d046e266ec7322b00a04f1e02a764e89ec4a25a diff --git a/appconfig/active-blacklistrc b/appconfig/active-blacklistrc index c4f017b..b87fa71 100644 --- a/appconfig/active-blacklistrc +++ b/appconfig/active-blacklistrc &lt; at &gt;&lt; at &gt; -1,4 +1,4 &lt; at &gt;&lt; at &gt; [blacklist] -apps=kwalletmanager,dolphinsu,nepomukbackup,flashplayer,qt4config,kmix,bluedevil-monolithic,akonaditray,nepomukcontroller,kleopatra,systemsettings,konsolesu,cups,korganizer,calligrasheets,calligrawords,calligrastage,calligramobile +apps=kwalletmanager,dolphinsu,nepomukbackup,flashplayer,qt4config,kmix,bluedevil-monolithic,akonaditray,nepomukcontroller,kleopatra,systemsettings,konsolesu,cups,korganizer,sheets,words,stage,calligramobile plasmoids=battery,currentappcontrol,keyboard_applet,org.kde.active.activityscreen,org.kde.active.notifications,org.kde.active.powerbutton,org.kde.active.systemtray,org.kde.appletstrip,org.kde.batterymonitor,org.kde.mobilenetworkoperator,org.kde.mobilenetworkstatus,org.kde.sharelikeconnect,org.kde.webdashboard,org.kde.active.connman,org.kde.locationchooser,org.kde.networkmanagement </pre> Marco Martin 2012-05-24T16:10:20 http://permalink.gmane.org/gmane.comp.kde.cvs/1141331 <pre>SVN commit 1296490 by yurchor: Add Apper man pages. M +1 -0 documentation_paths --- trunk/l10n-kde4/scripts/documentation_paths #1296489:1296490 &lt; at &gt;&lt; at &gt; -121,6 +121,7 &lt; at &gt;&lt; at &gt; module kdereview root svn://anonsvn.kde.org/home/kde/trunk/kdereview/doc +entry apper git://anongit.kde.org/apper.git HEAD:doc module extragear-accessibility entry ksimond git://anongit.kde.org/simon.git HEAD:doc/ksimond </pre> Yuri Chornoivan 2012-05-24T15:59:36 http://permalink.gmane.org/gmane.comp.kde.cvs/1141330 <pre>Git commit ee28c610b17fd6d1d2ed44db54f8cea6c05b1cbf by Sebastian Gottfried. Committed on 24/05/2012 at 17:51. Pushed by gottfried into branch 'next'. DataAccess: Take all possible locations for "data.xml" into account First step on the road to support for user created resources. M +59 -32 src/core/dataaccess.cpp M +2 -2 src/core/dataaccess.h M +1 -1 src/qml/LessonSelector.qml M +2 -2 src/qml/main.qml http://commits.kde.org/ktouch/ee28c610b17fd6d1d2ed44db54f8cea6c05b1cbf diff --git a/src/core/dataaccess.cpp b/src/core/dataaccess.cpp index 3239078..b8e4e5d 100644 --- a/src/core/dataaccess.cpp +++ b/src/core/dataaccess.cpp &lt; at &gt;&lt; at &gt; -18,6 +18,7 &lt; at &gt;&lt; at &gt; #include "dataaccess.h" #include &lt;QFile&gt; +#include &lt;QDir&gt; #include &lt;QDomDocument&gt; #include &lt;QDomElement&gt; #include &lt;QDomNodeList&gt; &lt; at &gt;&lt; at &gt; -48,39 +49,55 &lt; at &gt;&lt; at &gt; bool DataAccess::loadDataIndex(DataIndex* target) target-&gt;clearCourses(); target-&gt;clearKeyboardLayouts(); - QFile dataIndexFile; - if (!openResourceFile("data.xml", dataIndexFile)) - return false; QXmlSchema schema = loadXmlSchema("data"); if (!schema.isValid()) return false; - QDomDocument doc = getDomDocument(dataIndexFile, schema); - if (doc.isNull()) - { - kWarning() &lt;&lt; "invalid doc"; - return false; - } - QDomElement root(doc.documentElement()); - for (QDomElement dataNode = root.firstChildElement(); - !dataNode.isNull(); - dataNode = dataNode.nextSiblingElement()) + + const QDir userDir = QDir(KGlobal::dirs()-&gt;saveLocation("appdata", "", false)); + + foreach (const QString path, KGlobal::dirs()-&gt;findAllResources("appdata", "data.xml")) { - if (dataNode.tagName() == "course") + QDir dir = QFileInfo(path).dir(); + DataIndex::Source source = dir == userDir? DataIndex::UserResource: DataIndex::BuiltInResource; + QFile dataIndexFile; + dataIndexFile.setFileName(path); + if (!dataIndexFile.open(QIODevice::ReadOnly)) + { + kWarning() &lt;&lt; "can't open:" &lt;&lt; path; + return false; + } + QDomDocument doc = getDomDocument(dataIndexFile, schema); + if (doc.isNull()) { - DataIndexCourse* course = new DataIndexCourse(this); - course-&gt;setTitle(dataNode.firstChildElement("title").text()); - course-&gt;setDescription(dataNode.firstChildElement("description").text()); - course-&gt;setKeyboardLayoutName(dataNode.firstChildElement("keyboardLayout").text()); - course-&gt;setPath(dataNode.firstChildElement("path").text()); - target-&gt;addCourse(course); + kWarning() &lt;&lt; "invalid doc:" &lt;&lt; path; + return false; } - else if (dataNode.tagName() == "keyboardLayout") + QDomElement root(doc.documentElement()); + for (QDomElement dataNode = root.firstChildElement(); + !dataNode.isNull(); + dataNode = dataNode.nextSiblingElement()) { - DataIndexKeyboardLayout* keyboardLayout = new DataIndexKeyboardLayout(this); - keyboardLayout-&gt;setTitle(dataNode.firstChildElement("title").text()); - keyboardLayout-&gt;setName(dataNode.firstChildElement("name").text()); - keyboardLayout-&gt;setPath(dataNode.firstChildElement("path").text()); - target-&gt;addKeyboardLayout(keyboardLayout); + const QString path = dir.filePath(dataNode.firstChildElement("path").text()); + + if (dataNode.tagName() == "course") + { + DataIndexCourse* course = new DataIndexCourse(this); + course-&gt;setTitle(dataNode.firstChildElement("title").text()); + course-&gt;setDescription(dataNode.firstChildElement("description").text()); + course-&gt;setKeyboardLayoutName(dataNode.firstChildElement("keyboardLayout").text()); + course-&gt;setPath(path); + course-&gt;setSource(source); + target-&gt;addCourse(course); + } + else if (dataNode.tagName() == "keyboardLayout") + { + DataIndexKeyboardLayout* keyboardLayout = new DataIndexKeyboardLayout(this); + keyboardLayout-&gt;setTitle(dataNode.firstChildElement("title").text()); + keyboardLayout-&gt;setName(dataNode.firstChildElement("name").text()); + keyboardLayout-&gt;setPath(path); + keyboardLayout-&gt;setSource(source); + target-&gt;addKeyboardLayout(keyboardLayout); + } } } &lt; at &gt;&lt; at &gt; -88,12 +105,18 &lt; at &gt;&lt; at &gt; bool DataAccess::loadDataIndex(DataIndex* target) return true; } -bool DataAccess::loadResourceKeyboardLayout(const QString &amp;relPath, KeyboardLayout* target) +bool DataAccess::loadKeyboardLayout(const QString &amp;path, KeyboardLayout* target) { target-&gt;setIsValid(false); QFile keyboardLayoutFile; - if (!openResourceFile(relPath, keyboardLayoutFile)) + keyboardLayoutFile.setFileName(path); + if (!keyboardLayoutFile.open(QIODevice::ReadOnly)) + { + kWarning() &lt;&lt; "can't open:" &lt;&lt; path; + return false; + } + if (!openResourceFile(path, keyboardLayoutFile)) return false; QXmlSchema schema = loadXmlSchema("keyboardlayout"); if (!schema.isValid()) &lt; at &gt;&lt; at &gt; -101,7 +124,7 &lt; at &gt;&lt; at &gt; bool DataAccess::loadResourceKeyboardLayout(const QString &amp;relPath, KeyboardLayo QDomDocument doc = getDomDocument(keyboardLayoutFile, schema); if (doc.isNull()) { - kWarning() &lt;&lt; "invalid doc"; + kWarning() &lt;&lt; "invalid doc:" &lt;&lt; path; return false; } QDomElement root(doc.documentElement()); &lt; at &gt;&lt; at &gt; -158,19 +181,23 &lt; at &gt;&lt; at &gt; bool DataAccess::loadResourceKeyboardLayout(const QString &amp;relPath, KeyboardLayo return true; } -bool DataAccess::loadResourceCourse(const QString &amp;relPath, Course* target) +bool DataAccess::loadCourse(const QString &amp;path, Course* target) { target-&gt;setIsValid(false); QFile courseFile; - if (!openResourceFile(relPath, courseFile)) + courseFile.setFileName(path); + if (!courseFile.open(QIODevice::ReadOnly)) + { + kWarning() &lt;&lt; "can't open:" &lt;&lt; path; return false; + } QXmlSchema schema = loadXmlSchema("course"); if (!schema.isValid()) return false; QDomDocument doc = getDomDocument(courseFile, schema); if (doc.isNull()) { - kWarning() &lt;&lt; "invalid doc"; + kWarning() &lt;&lt; "invalid doc:" &lt;&lt; path; return false; } QDomElement root(doc.documentElement()); diff --git a/src/core/dataaccess.h b/src/core/dataaccess.h index 1283d4a..4e98920 100644 --- a/src/core/dataaccess.h +++ b/src/core/dataaccess.h &lt; at &gt;&lt; at &gt; -33,8 +33,8 &lt; at &gt;&lt; at &gt; class DataAccess : public QObject public: explicit DataAccess(QObject *parent = 0); Q_INVOKABLE bool loadDataIndex(DataIndex* target); - Q_INVOKABLE bool loadResourceKeyboardLayout(const QString&amp; relPath, KeyboardLayout* target); - Q_INVOKABLE bool loadResourceCourse(const QString&amp; relPath, Course* targe); + Q_INVOKABLE bool loadKeyboardLayout(const QString&amp; path, KeyboardLayout* target); + Q_INVOKABLE bool loadCourse(const QString&amp; path, Course* target); private: QXmlSchema loadXmlSchema(const QString&amp; name); diff --git a/src/qml/LessonSelector.qml b/src/qml/LessonSelector.qml index 0e9187e..9aad7b6 100644 --- a/src/qml/LessonSelector.qml +++ b/src/qml/LessonSelector.qml &lt; at &gt;&lt; at &gt; -76,7 +76,7 &lt; at &gt;&lt; at &gt; Item { if (isValid &amp;&amp; path === dataIndexCourse.path) return path = dataIndexCourse.path - dataAccess.loadResourceCourse(path, course) + dataAccess.loadCourse(path, course) } Component.onCompleted: update() } diff --git a/src/qml/main.qml b/src/qml/main.qml index 0d9b30c..c2aadf3 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml &lt; at &gt;&lt; at &gt; -78,7 +78,7 &lt; at &gt;&lt; at &gt; Item { { var dataIndexLayout = dataIndex.keyboardLayout(i) if (dataIndexLayout.name === name) { - dataAccess.loadResourceKeyboardLayout(dataIndexLayout.path, keyboardLayout) + dataAccess.loadKeyboardLayout(dataIndexLayout.path, keyboardLayout) return } } &lt; at &gt;&lt; at &gt; -89,7 +89,7 &lt; at &gt;&lt; at &gt; Item { { var dataIndexLayout = dataIndex.keyboardLayout(i) if (name.search(dataIndexLayout.name) === 0) { - dataAccess.loadResourceKeyboardLayout(dataIndexLayout.path, keyboardLayout) + dataAccess.loadKeyboardLayout(dataIndexLayout.path, keyboardLayout) return } } </pre> Sebastian Gottfried 2012-05-24T15:56:09 http://permalink.gmane.org/gmane.comp.kde.cvs/1141329 <pre>Git commit 9fafb54c071d2b2d3e4a8afe49e640163dd86266 by Sebastian Gottfried. Committed on 24/05/2012 at 17:55. Pushed by gottfried into branch 'next'. fix typo M +1 -1 src/qml/TrainingScreen.qml M +1 -1 src/qml/main.qml http://commits.kde.org/ktouch/9fafb54c071d2b2d3e4a8afe49e640163dd86266 diff --git a/src/qml/TrainingScreen.qml b/src/qml/TrainingScreen.qml index 900e8b4..d3a809a 100644 --- a/src/qml/TrainingScreen.qml +++ b/src/qml/TrainingScreen.qml &lt; at &gt;&lt; at &gt; -29,7 +29,7 &lt; at &gt;&lt; at &gt; FocusScope { property Lesson lesson property alias stats: stats - property alias referenceStas: referenceStats + property alias referenceStats: referenceStats signal restartRequested() signal abortRequested() diff --git a/src/qml/main.qml b/src/qml/main.qml index c2aadf3..4f1c1a6 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml &lt; at &gt;&lt; at &gt; -156,7 +156,7 &lt; at &gt;&lt; at &gt; Item { course: trainingScreen.course lesson: trainingScreen.lesson stats: trainingScreen.stats - referenceStats: trainingScreen.referenceStas + referenceStats: trainingScreen.referenceStats onHomeScreenRequested: main.switchScreen(scoreScreen, homeScreen) onLessonRepetionRequested: main.switchScreen(scoreScreen, trainingScreen) onNextLessonRequested: { </pre> Sebastian Gottfried 2012-05-24T15:56:09 http://permalink.gmane.org/gmane.comp.kde.cvs/1141328 <pre>Git commit d1f73969fd4cbfbd0cfc1d514761bad585441b2b by Sebastian Gottfried. Committed on 24/05/2012 at 15:45. Pushed by gottfried into branch 'next'. training config widget: lay out accoarding to KDE HIG guidelines M +13 -1 src/ui/trainingconfigwidget.ui http://commits.kde.org/ktouch/d1f73969fd4cbfbd0cfc1d514761bad585441b2b diff --git a/src/ui/trainingconfigwidget.ui b/src/ui/trainingconfigwidget.ui index b1c7e8b..20c15e7 100644 --- a/src/ui/trainingconfigwidget.ui +++ b/src/ui/trainingconfigwidget.ui &lt; at &gt;&lt; at &gt; -44,7 +44,7 &lt; at &gt;&lt; at &gt; &lt;property name="title"&gt; &lt;string&gt;Lesson unlocking limits&lt;/string&gt; &lt;/property&gt; - &lt;layout class="QGridLayout" name="gridLayout_2"&gt; + &lt;layout class="QFormLayout" name="formLayout"&gt; &lt;item row="0" column="0"&gt; &lt;widget class="QLabel" name="requiredStrokesPerMinuteLabel"&gt; &lt;property name="text"&gt; &lt; at &gt;&lt; at &gt; -60,6 +60,12 &lt; at &gt;&lt; at &gt; &lt;/item&gt; &lt;item row="0" column="1"&gt; &lt;widget class="KIntNumInput" name="kcfg_RequiredStrokesPerMinute"&gt; + &lt;property name="sizePolicy"&gt; + &lt;sizepolicy hsizetype="Expanding" vsizetype="Fixed"&gt; + &lt;horstretch&gt;0&lt;/horstretch&gt; + &lt;verstretch&gt;0&lt;/verstretch&gt; + &lt;/sizepolicy&gt; + &lt;/property&gt; &lt;property name="minimum"&gt; &lt;number&gt;0&lt;/number&gt; &lt;/property&gt; &lt; at &gt;&lt; at &gt; -89,6 +95,12 &lt; at &gt;&lt; at &gt; &lt;/item&gt; &lt;item row="1" column="1"&gt; &lt;widget class="KIntNumInput" name="kcfg_RequiredAccuracy"&gt; + &lt;property name="sizePolicy"&gt; + &lt;sizepolicy hsizetype="Expanding" vsizetype="Fixed"&gt; + &lt;horstretch&gt;0&lt;/horstretch&gt; + &lt;verstretch&gt;0&lt;/verstretch&gt; + &lt;/sizepolicy&gt; + &lt;/property&gt; &lt;property name="minimum"&gt; &lt;number&gt;90&lt;/number&gt; &lt;/property&gt; </pre> Sebastian Gottfried 2012-05-24T15:56:09 http://permalink.gmane.org/gmane.comp.kde.cvs/1141327 <pre>Git commit a4cc73bdaae7ea3058dd52a79c3251989534586c by Marco Martin. Committed on 24/05/2012 at 17:48. Pushed by mart into branch 'master'. new default setup: more empty look M +9 -4 skel/activitymanagerrc M +29 -65 skel/plasma-device-appletsrc http://commits.kde.org/plasma-mobile-config/a4cc73bdaae7ea3058dd52a79c3251989534586c diff --git a/skel/activitymanagerrc b/skel/activitymanagerrc index 25b7727..0993770 100644 --- a/skel/activitymanagerrc +++ b/skel/activitymanagerrc &lt; at &gt;&lt; at &gt; -1,8 +1,13 &lt; at &gt;&lt; at &gt; [activities] -ddc0a8fa-5f0f-4285-98fc-45fc79939111=Introduction -a0787a83-d89a-42ef-8af7-a716b04a07e8=Vacation planning -fd1bca61-d525-418c-8a7b-8a15c468fc34=My first Activity +ddc0a8fa-5f0f-4285-98fc-45fc79939111=Welcome +fd1bca61-d525-418c-8a7b-8a15c468fc34=New Activity + +[activitiesDesktops] +ddc0a8fa-5f0f-4285-98fc-45fc79939111=1 +fd1bca61-d525-418c-8a7b-8a15c468fc34=1 [main] currentActivity=ddc0a8fa-5f0f-4285-98fc-45fc79939111 -runningActivities=ddc0a8fa-5f0f-4285-98fc-45fc79939111,a0787a83-d89a-42ef-8af7-a716b04a07e8,fd1bca61-d525-418c-8a7b-8a15c468fc34 \ No newline at end of file +lastUnlockedActivity=ddc0a8fa-5f0f-4285-98fc-45fc79939111 +ontologyVersion=1 +runningActivities=ddc0a8fa-5f0f-4285-98fc-45fc79939111,fd1bca61-d525-418c-8a7b-8a15c468fc34 diff --git a/skel/plasma-device-appletsrc b/skel/plasma-device-appletsrc index 19e79c7..a18ecdb 100644 --- a/skel/plasma-device-appletsrc +++ b/skel/plasma-device-appletsrc &lt; at &gt;&lt; at &gt; -1,6 +1,6 &lt; at &gt;&lt; at &gt; [Containments][22] ActionPluginsSource=Global -activity=Introduction +activity=Welcome activityId=ddc0a8fa-5f0f-4285-98fc-45fc79939111 desktop=-1 formfactor=0 &lt; at &gt;&lt; at &gt; -12,18 +12,27 &lt; at &gt;&lt; at &gt; location=1 plugin=org.kde.active.activityscreen screen=0 wallpaperplugin=image -wallpaperpluginmode=SingleImage +wallpaperpluginmode= zvalue=0 [Containments][22][Applets][35] -geometry=0,0,684,572 +geometry=0,0,488,474 immutability=1 plugin=org.kde.active.welcome zvalue=0 +[Containments][22][Applets][37] +geometry=0,0,316,343 +immutability=1 +plugin=org.kde.news-qml +zvalue=0 + +[Containments][22][Applets][37][Configuration][General] +feeds=http://dot.kde.org/rss.xml,http://opentablets.org/rss/ccs/1-home/ + [Containments][22][General] FirstStartup=false -ItemsGeometries=InformationElement:534,158,178,158;Bookmark:0,158,356,158;Image:356,0,178,158;Application:534,0,178,158;nfo%3AApplication:712,0,178,158;nfo%3ABookmark:890,0,356,158;Applet-35:0,0,712,632; +ItemsGeometries=InformationElement:534,158,178,158;Bookmark:0,158,356,158;Image:356,0,178,158;Application:534,0,178,158;nfo%3AApplication:688,0,172,131;nfo%3ABookmark:516,0,344,131;Applet-35:0,0,516,524;Applet-37:516,131,344,393;Applet-39:860,0,344,262;Applet-41:859,-5,344,262;Applet-42:860,0,344,262; [Containments][22][Wallpaper][image] slideTimer=10 &lt; at &gt;&lt; at &gt; -33,66 +42,17 &lt; at &gt;&lt; at &gt; wallpaper=/usr/share/wallpapers/default_wallpaper.png wallpapercolor=0,0,0 wallpaperposition=2 -[Containments][28] -ActionPluginsSource=Global -activity=Vacation planning -activityId=a0787a83-d89a-42ef-8af7-a716b04a07e8 -desktop=-1 -formfactor=0 -geometry=0,0,1366,768 -immutability=1 -lastDesktop=-1 -lastScreen=0 -location=0 -plugin=org.kde.active.activityscreen -screen=-1 -wallpaperplugin=image -wallpaperpluginmode=SingleImage -zvalue=0 - -[Containments][28][Applets][36] -geometry=0,0,328,256 -immutability=1 -plugin=plasma_applet_notes -zvalue=0 - [Containments][28][Applets][36][Configuration] -autoSaveHtml=&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"&gt;\n&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;\np, li { white-space: pre-wrap; }\n&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-family:'Droid Sans Fallback'; font-size:11pt; font-weight:400; font-style:normal;"&gt;\n&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; +autoSaveHtml=&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"&gt;\n&lt;html&gt;&lt;head&gt;&lt;meta name="qrichtext" content="1" /&gt;&lt;style type="text/css"&gt;\np, li { white-space: pre-wrap; }\n&lt;/style&gt;&lt;/head&gt;&lt;body style=" font-family:'Droid Sans Fallback'; font-size:10pt; font-weight:400; font-style:normal;"&gt;\n&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; scrollValue=0 -[Containments][28][Applets][37] -geometry=0,0,506,256 -immutability=1 -plugin=weather -zvalue=0 - -[Containments][28][Applets][37][Configuration] -Share=false -pressureUnit=5028 -source=bbcukmet|weather|Berlin - Brandenburg International, Germany|http://newsrss.bbc.co.uk/weather/forecast/2087/ObservationsRSS.xml -speedUnit=9002 -temperatureUnit=6002 -updateInterval=30 -visibilityUnit=2007 - -[Containments][28][General] -ItemsGeometries=Image:0,316,178,158;Application:356,474,534,158;Bookmark:356,0,534,158;nfo%3AApplication:0,316,534,158;nfo%3ABookmark:534,316,534,158;Applet-36:712,0,356,316;Applet-37:0,0,534,316; - -[Containments][28][Wallpaper][image] -slideTimer=10 -slidepaths=/usr/share/wallpapers/ -userswallpapers=/usr/share/wallpapers/field.jpg -wallpaper=/usr/share/wallpapers/field.jpg -wallpapercolor=0,0,0 -wallpaperposition=0 - [Containments][30] ActionPluginsSource=Global -activity=My first Activity +activity=New Activity activityId=fd1bca61-d525-418c-8a7b-8a15c468fc34 desktop=-1 formfactor=0 -geometry=0,0,1366,768 +geometry=1366,768,1366,768 immutability=1 lastDesktop=-1 lastScreen=0 &lt; at &gt;&lt; at &gt; -100,7 +60,7 &lt; at &gt;&lt; at &gt; location=0 plugin=org.kde.active.activityscreen screen=-1 wallpaperplugin=image -wallpaperpluginmode=SingleImage +wallpaperpluginmode= zvalue=0 [Containments][30][Wallpaper][image] &lt; at &gt;&lt; at &gt; -130,31 +90,35 &lt; at &gt;&lt; at &gt; wallpaperpluginmode=SingleImage zvalue=0 [Containments][9][Applets][10] -geometry=0,0,32,32 +geometry=6.5,0,32,32 immutability=1 plugin=notifier zvalue=0 [Containments][9][Applets][11] -geometry=0,0,32,32 +geometry=14.5,0,32,32 immutability=1 plugin=battery zvalue=0 [Containments][9][Applets][12] -geometry=0,0,32,32 +geometry=6.5,0,32,32 immutability=1 plugin=org.kde.networkmanagement zvalue=0 +[Containments][9][Applets][12][PopupApplet] +DialogHeight=306 +DialogWidth=381 + [Containments][9][Applets][13] -geometry=0,0,32,32 +geometry=6.5,0,32,32 immutability=1 plugin=org.kde.active.notifications zvalue=0 [Containments][9][Applets][14] -geometry=0,0,112,32 +geometry=0,0,141,32 immutability=1 plugin=org.kde.sharelikeconnect zvalue=0 &lt; at &gt;&lt; at &gt; -169,17 +133,17 &lt; at &gt;&lt; at &gt; zvalue=0 ShowCalendarPopup=false [Containments][9][Applets][16] -geometry=0,0,32,32 +geometry=6.5,0,32,32 immutability=1 plugin=org.kde.locationchooser zvalue=0 [Containments][9][Applets][17] -geometry=0,0,32,32 +geometry=0,0,45,32 immutability=1 plugin=org.kde.active.powerbutton zvalue=0 [Containments][9][General] -AppletsOrder=:10:11:12:13:16 +AppletsOrder=:10:11:12:13:16:17 SkipItems=klipper </pre> Marco Martin 2012-05-24T15:49:15 http://permalink.gmane.org/gmane.comp.kde.cvs/1141326 <pre>Git commit 16eb7639c2971d144b30ae8bb60a00ded81363a8 by Jekyll Wu. Committed on 24/05/2012 at 16:21. Pushed by jekyllwu into branch 'master'. Use KService to lookup the library name of konsolepart REVIEW: 105028 M +8 -3 app/terminal.cpp http://commits.kde.org/yakuake/16eb7639c2971d144b30ae8bb60a00ded81363a8 diff --git a/app/terminal.cpp b/app/terminal.cpp index 79c19ab..52b2718 100644 --- a/app/terminal.cpp +++ b/app/terminal.cpp &lt; at &gt;&lt; at &gt; -30,6 +30,7 &lt; at &gt;&lt; at &gt; #include &lt;KMessageBox&gt; #include &lt;KPluginFactory&gt; #include &lt;KPluginLoader&gt; +#include &lt;KService&gt; #include &lt;KUser&gt; #include &lt;QAction&gt; &lt; at &gt;&lt; at &gt; -58,9 +59,13 &lt; at &gt;&lt; at &gt; Terminal::Terminal(QWidget* parent) : QObject(parent) m_terminalWidget = NULL; m_parentSplitter = parent; - KPluginFactory* factory = KPluginLoader("konsolepart").factory(); - if (!factory) - factory = KPluginLoader("libkonsolepart").factory(); // deprecated name + KPluginFactory* factory = 0; + KService::Ptr service = KService::serviceByDesktopName("konsolepart"); + if( service ) + { + factory = KPluginLoader(service-&gt;library()).factory(); + } + m_part = factory ? (factory-&gt;create&lt;KParts::Part&gt;(parent)) : 0; if (m_part) </pre> Jekyll Wu 2012-05-24T15:41:04 http://permalink.gmane.org/gmane.comp.kde.cvs/1141325 <pre>Git commit 5ddea5401b5f79c1ee8ac2faae843e4ea9e3448b by Aleix Pol. Committed on 24/05/2012 at 17:29. Pushed by apol into branch 'master'. Adapt to the new API to extract origin from its hostname Fixes filtering from the source page M +0 -6 discover/ApplicationProxyModelHelper.cpp M +0 -2 discover/ApplicationProxyModelHelper.h M +22 -0 discover/OriginsBackend.cpp M +2 -0 discover/OriginsBackend.h M +0 -1 discover/qml/ApplicationsListPage.qml M +4 -2 discover/qml/SourcesPage.qml M +2 -2 discover/qml/navigation.js http://commits.kde.org/muon/5ddea5401b5f79c1ee8ac2faae843e4ea9e3448b diff --git a/discover/ApplicationProxyModelHelper.cpp b/discover/ApplicationProxyModelHelper.cpp index eb81c25..91f2946 100644 --- a/discover/ApplicationProxyModelHelper.cpp +++ b/discover/ApplicationProxyModelHelper.cpp &lt; at &gt;&lt; at &gt; -93,9 +93,3 &lt; at &gt;&lt; at &gt; QString ApplicationProxyModelHelper::stringSortRole() const { return roleToString(sortRole()); } - -void ApplicationProxyModelHelper::setOriginHostFilter(const QString&amp; host) -{ - QString origin = BackendsSingleton::self()-&gt;backend()-&gt;originForSite(QUrl(host).host()); - setOriginFilter(origin); -} diff --git a/discover/ApplicationProxyModelHelper.h b/discover/ApplicationProxyModelHelper.h index 8a1e2be..1d9e4d8 100644 --- a/discover/ApplicationProxyModelHelper.h +++ b/discover/ApplicationProxyModelHelper.h &lt; at &gt;&lt; at &gt; -30,7 +30,6 &lt; at &gt;&lt; at &gt; class ApplicationProxyModelHelper : public ApplicationProxyModel Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole_hack NOTIFY sortRoleChanged) Q_PROPERTY(QString stringSortRole READ stringSortRole WRITE setStringSortRole_hack NOTIFY sortRoleChanged) Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE setSortOrder_hack NOTIFY sortOrderChanged) - Q_PROPERTY(QString originHostFilter READ originFilter WRITE setOriginHostFilter) public: void setStateFilter_hack(int state); explicit ApplicationProxyModelHelper(QObject* parent = 0); &lt; at &gt;&lt; at &gt; -39,7 +38,6 &lt; at &gt;&lt; at &gt; class ApplicationProxyModelHelper : public ApplicationProxyModel Q_SCRIPTABLE int stringToRole(const QByteArray&amp; strRole) const; Q_SCRIPTABLE QByteArray roleToString(int role) const; - void setOriginHostFilter(const QString&amp; host); void setSortRole_hack(int role); void setSortOrder_hack(Qt::SortOrder order); void setStringSortRole_hack(const QString&amp; role); diff --git a/discover/OriginsBackend.cpp b/discover/OriginsBackend.cpp index e16942d..6658b09 100644 --- a/discover/OriginsBackend.cpp +++ b/discover/OriginsBackend.cpp &lt; at &gt;&lt; at &gt; -180,4 +180,26 &lt; at &gt;&lt; at &gt; QDeclarativeListProperty&lt;Entry&gt; Source::entries() return QDeclarativeListProperty&lt;Entry&gt;(this, m_entries); } +QString Source::name() const +{ + QUrl uri(m_uri); + QStringList origins = BackendsSingleton::self()-&gt;backend()-&gt;originsForHost(uri.host()); + if(origins.size()==1) + return origins.first(); + else if(origins.size()==0) + return QString(); + else { + QString path = uri.path(); + int firstSlash = path.indexOf('/', 1); + int secondSlash = path.indexOf('/', firstSlash+1); + QString launchpadifyUri = path.mid(1,secondSlash-1).replace('/', '-'); + QStringList results = origins.filter(launchpadifyUri, Qt::CaseInsensitive); + if(results.isEmpty()) { + launchpadifyUri = path.mid(1,firstSlash-1).replace('/', '-'); + results = origins.filter(launchpadifyUri, Qt::CaseInsensitive); + } + return results.isEmpty() ? QString() : results.first(); + } +} + #include "moc_OriginsBackend.cpp" diff --git a/discover/OriginsBackend.h b/discover/OriginsBackend.h index 295f5f5..21ade7e 100644 --- a/discover/OriginsBackend.h +++ b/discover/OriginsBackend.h &lt; at &gt;&lt; at &gt; -58,6 +58,7 &lt; at &gt;&lt; at &gt; class Entry : public QObject class Source : public QObject { Q_OBJECT + Q_PROPERTY(QString name READ name CONSTANT) Q_PROPERTY(QString uri READ uri CONSTANT) Q_PROPERTY(QDeclarativeListProperty&lt;Entry&gt; entries READ entries CONSTANT) public: &lt; at &gt;&lt; at &gt; -66,6 +67,7 &lt; at &gt;&lt; at &gt; class Source : public QObject void setUri(const QString&amp; uri) { m_uri = uri; } void addEntry(Entry* entry) { m_entries.append(entry); } QDeclarativeListProperty&lt;Entry&gt; entries(); + QString name() const; private: QString m_uri; diff --git a/discover/qml/ApplicationsListPage.qml b/discover/qml/ApplicationsListPage.qml index bc7f468..2b45ebd 100644 --- a/discover/qml/ApplicationsListPage.qml +++ b/discover/qml/ApplicationsListPage.qml &lt; at &gt;&lt; at &gt; -11,7 +11,6 &lt; at &gt;&lt; at &gt; Page { property alias sortOrder: appsModel.sortOrder property alias stateFilter: appsModel.stateFilter property alias originFilter: appsModel.originFilter - property alias originHostFilter: appsModel.originHostFilter //hack to be able to provide the url property string sectionProperty: "" property string search: "" property Component sectionDelegate: null diff --git a/discover/qml/SourcesPage.qml b/discover/qml/SourcesPage.qml index 7c39d6b..8c6e698 100644 --- a/discover/qml/SourcesPage.qml +++ b/discover/qml/SourcesPage.qml &lt; at &gt;&lt; at &gt; -81,6 +81,7 &lt; at &gt;&lt; at &gt; Page { anchors.left: parent.left anchors.right: parent.right Keys.onEnterPressed: newSourceDialog.accept() + focus: true } } } &lt; at &gt;&lt; at &gt; -139,7 +140,7 &lt; at &gt;&lt; at &gt; Page { fill: parent leftMargin: removeButton.width+5 } - text: modelData.uri + text: modelData.name=="" ? modelData.uri : i18n("%1. &lt;em&gt;%2&lt;/em&gt;", modelData.name, modelData.uri) } Label { anchors { &lt; at &gt;&lt; at &gt; -150,8 +151,9 &lt; at &gt;&lt; at &gt; Page { } ToolButton { id: browseOrigin + enabled: modelData.name!="" iconSource: "view-filter" - onClicked: Navigation.openApplicationListSource(modelData.uri) + onClicked: Navigation.openApplicationListSource(modelData.name) anchors { bottom: parent.bottom right: parent.right diff --git a/discover/qml/navigation.js b/discover/qml/navigation.js index ca1ca80..424b66d 100644 --- a/discover/qml/navigation.js +++ b/discover/qml/navigation.js &lt; at &gt;&lt; at &gt; -2,8 +2,8 &lt; at &gt;&lt; at &gt; function openApplicationList(icon, name, cat, search) { openPage(icon, name, applicationListComp, { category: cat, search: search, preferList: search!="" }) } -function openApplicationListSource(uri) { - openPage("view-filter", uri, applicationListComp, { originHostFilter: uri, preferList: true }) +function openApplicationListSource(origin) { + openPage("view-filter", origin, applicationListComp, { originFilter: origin, preferList: true }) } function openCategory(icon, name, cat) { </pre> Aleix Pol 2012-05-24T15:29:42 http://permalink.gmane.org/gmane.comp.kde.cvs/1141324 <pre>Git commit 605691f501274decd407bf094a654d8c9c4f1fc8 by Aleix Pol. Committed on 24/05/2012 at 15:16. Pushed by apol into branch 'master'. Fix crash if switching to sources too early. Delay OriginsBackend initialization until we have an apt backend. M +6 -1 discover/OriginsBackend.cpp http://commits.kde.org/muon/605691f501274decd407bf094a654d8c9c4f1fc8 diff --git a/discover/OriginsBackend.cpp b/discover/OriginsBackend.cpp index 50eb653..e16942d 100644 --- a/discover/OriginsBackend.cpp +++ b/discover/OriginsBackend.cpp &lt; at &gt;&lt; at &gt; -33,7 +33,7 &lt; at &gt;&lt; at &gt; OriginsBackend::OriginsBackend(QObject* parent) : QObject(parent) { - QMetaObject::invokeMethod(this, "load", Qt::QueuedConnection); + load(); } OriginsBackend::~OriginsBackend() &lt; at &gt;&lt; at &gt; -43,6 +43,11 &lt; at &gt;&lt; at &gt; OriginsBackend::~OriginsBackend() void OriginsBackend::load() { + if(!BackendsSingleton::self()-&gt;backend()) { + QMetaObject::invokeMethod(this, "load", Qt::QueuedConnection); + return; + } + qDeleteAll(m_sources); m_sources.clear(); //load /etc/apt/sources.list </pre> Aleix Pol 2012-05-24T15:29:42 http://permalink.gmane.org/gmane.comp.kde.cvs/1141323 <pre>Git commit 8264e9c3936c22fe414f8741de7cc9a25240223f by Aleix Pol. Committed on 24/05/2012 at 17:27. Pushed by apol into branch 'master'. Remove unused member policy in the apt backend private class CCMAIL: echidnaman&lt; at &gt;kubuntu.org M +0 -1 src/backend.cpp http://commits.kde.org/libqapt/8264e9c3936c22fe414f8741de7cc9a25240223f diff --git a/src/backend.cpp b/src/backend.cpp index 2da3933..97928f2 100644 --- a/src/backend.cpp +++ b/src/backend.cpp &lt; at &gt;&lt; at &gt; -91,7 +91,6 &lt; at &gt;&lt; at &gt; public: // Pointer to the apt cache object Cache *cache; - pkgPolicy *policy; pkgRecords *records; // Undo/redo stuff </pre> Aleix Pol 2012-05-24T15:28:02 http://permalink.gmane.org/gmane.comp.kde.cvs/1141322 <pre>Git commit c2fd589bf65319c51d9f0c39a66e6c6d6193aebe by Aleix Pol. Committed on 24/05/2012 at 17:25. Pushed by apol into branch 'master'. We can have different origins per host Return a list accordingly M +3 -3 src/backend.cpp M +2 -2 src/backend.h http://commits.kde.org/libqapt/c2fd589bf65319c51d9f0c39a66e6c6d6193aebe diff --git a/src/backend.cpp b/src/backend.cpp index db5c47e..2da3933 100644 --- a/src/backend.cpp +++ b/src/backend.cpp &lt; at &gt;&lt; at &gt; -253,7 +253,7 &lt; at &gt;&lt; at &gt; void Backend::reloadCache() pkgCache::VerFileIterator VF = Ver.FileList(); QLatin1String origin(QLatin1String(VF.File().Origin())); d-&gt;originMap[origin] = VF.File().Label(); - d-&gt;siteMap[VF.File().Site()] = origin; + d-&gt;siteMap[origin] = VF.File().Site(); } } &lt; at &gt;&lt; at &gt; -1530,10 +1530,10 &lt; at &gt;&lt; at &gt; void Backend::serviceOwnerChanged(const QString &amp;name, const QString &amp;oldOwner, } } -QString Backend::originForSite(const QString&amp; host) const +QStringList Backend::originsForHost(const QString&amp; host) const { Q_D(const Backend); - return d-&gt;siteMap[host]; + return d-&gt;siteMap.keys(host); } } diff --git a/src/backend.h b/src/backend.h index 71d716d..780ad4a 100644 --- a/src/backend.h +++ b/src/backend.h &lt; at &gt;&lt; at &gt; -228,9 +228,9 &lt; at &gt;&lt; at &gt; public: QString origin(QString originLabel) const; /** - * &lt; at &gt;returns the origin for a given &lt; at &gt;p host + * &lt; at &gt;returns the origins for a given &lt; at &gt;p host */ - QString originForSite(const QString&amp; host) const; + QStringList originsForHost(const QString&amp; host) const; // TODO: QApt2: Around that time it might be wise to use qint64 for count()'s /** </pre> Aleix Pol 2012-05-24T15:26:22 http://permalink.gmane.org/gmane.comp.kde.cvs/1141321 <pre>Git commit 51013da69a226d23c2404617541f05bf7d22e61b by Jan Lepper. Committed on 24/05/2012 at 16:08. Pushed by janlepper into branch 'master'. re-enable KrArc this reintroduces bug 280939 see https://bugs.kde.org/show_bug.cgi?id=294542 M +1 -2 CMakeLists.txt M +0 -4 ChangeLog http://commits.kde.org/krusader/51013da69a226d23c2404617541f05bf7d22e61b diff --git a/CMakeLists.txt b/CMakeLists.txt index 981945c..0dbbe5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt &lt; at &gt;&lt; at &gt; -13,8 +13,7 &lt; at &gt;&lt; at &gt; set(CMAKE_VERBOSE_MAKEFILE OFF) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -# FIX krarc (bug 280939 and general maintainability) before enabling this !!! -# add_definitions( "-DKRARC_ENABLED" ) +add_definitions( "-DKRARC_ENABLED" ) #include(ConfigureChecks.cmake) diff --git a/ChangeLog b/ChangeLog index 813a187..e07317a 100644 --- a/ChangeLog +++ b/ChangeLog &lt; at &gt;&lt; at &gt; -1,5 +1,3 &lt; at &gt;&lt; at &gt; - CHANGED: disabled krarc ioslave because of bug 280939 resulting in data loss. - FIXED: root mode action doesn't work if a panel url contains spaces FIXED: relative url completion in address-bar only works in home dir FIXED: [ 242566 ] Cannot F3-View .vcf vCard files &lt; at &gt;&lt; at &gt; -12,8 +10,6 &lt; at &gt;&lt; at &gt; FIXED: [ 276310 ] crash when trying to delete already deleted file FIXED: [ 277578 ] Crash on cancelling calculation of occupied space on smb share FIXED: krusader hangs for some time when opening a bz2(and possibly gzip)-compressed archive - FIXED: [ 280939 ] krusader deletes zip archive when cut&amp;pasting it into itself - NOTE: the fix is to disable krarc, see CHANGED section FIXED: loading defaults on the Panel page in Konfigurator has no effect FIXED: changes to "Show new/close tab buttons" don't take effect immediately FIXED: when options requiring a gui restart are changed, the panel history is lost </pre> Jan Lepper 2012-05-24T15:18:54 http://permalink.gmane.org/gmane.comp.kde.cvs/1141320 <pre>Git commit 817512068e780fe3d3d025e049fa99ee02210129 by Jan Lepper. Committed on 24/05/2012 at 16:00. Pushed by janlepper into branch 'master'. KrArc: make KRDEBUG() work M +2 -1 krArc/krarc.cpp http://commits.kde.org/krusader/817512068e780fe3d3d025e049fa99ee02210129 diff --git a/krArc/krarc.cpp b/krArc/krarc.cpp index 8f62982..e910df3 100644 --- a/krArc/krarc.cpp +++ b/krArc/krarc.cpp &lt; at &gt;&lt; at &gt; -62,7 +62,8 &lt; at &gt;&lt; at &gt; f.close(); \ } while(0); #else -#define KRDEBUG(X...) +// #define KRDEBUG(X...) +#define KRDEBUG(X...) kDebug()&lt;&lt;X #endif using namespace KIO; </pre> Jan Lepper 2012-05-24T15:18:54 http://permalink.gmane.org/gmane.comp.kde.cvs/1141319 <pre>Git commit 122e39b30fac5ca7b88174af6fc67a077a65a5c6 by Vishesh Handa. Committed on 24/05/2012 at 17:07. Pushed by vhanda into branch 'master'. Enable the interface file generation M +14 -14 nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt http://commits.kde.org/kde-runtime/122e39b30fac5ca7b88174af6fc67a077a65a5c6 diff --git a/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt b/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt index 3aace02..2f82c6b 100644 --- a/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt +++ b/nepomuk/kioslaves/search/kdedmodule/CMakeLists.txt &lt; at &gt;&lt; at &gt; -16,20 +16,20 &lt; at &gt;&lt; at &gt; set(nepomuksearchmodule_SRCS soprano_add_ontology(nepomuksearchmodule_SRCS ${NEPOMUK_CORE_ONTOLOGY_DIR}/kde/kext.trig "KExt" "Nepomuk2::Vocabulary" "trig") -#set_source_files_properties( -# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.Query.xml -# PROPERTIES INCLUDE "nepomuk2/result.h") - -#set_source_files_properties( -# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.QueryService.xml -# PROPERTIES INCLUDE "dbusoperators_p.h") - -#qt4_add_dbus_interface(nepomuksearchmodule_SRCS -# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.QueryService.xml -# queryserviceinterface) -#qt4_add_dbus_interface(nepomuksearchmodule_SRCS -# ${NEPOMUK_CORE_DBUS_INTERFACE_DIR}/org.kde.nepomuk.Query.xml -# queryinterface) +set_source_files_properties( + ${NEPOMUK_CORE_DBUS_INTERFACES_DIR}/org.kde.nepomuk.Query.xml + PROPERTIES INCLUDE "nepomuk2/result.h") + +set_source_files_properties( + ${NEPOMUK_CORE_DBUS_INTERFACES_DIR}/org.kde.nepomuk.QueryService.xml + PROPERTIES INCLUDE "dbusoperators_p.h") + +qt4_add_dbus_interface(nepomuksearchmodule_SRCS + ${NEPOMUK_CORE_DBUS_INTERFACES_DIR}/org.kde.nepomuk.QueryService.xml + queryserviceinterface) +qt4_add_dbus_interface(nepomuksearchmodule_SRCS + ${NEPOMUK_CORE_DBUS_INTERFACES_DIR}/org.kde.nepomuk.Query.xml + queryinterface) kde4_add_plugin(kded_nepomuksearchmodule ${nepomuksearchmodule_SRCS}) </pre> Vishesh Handa 2012-05-24T15:13:47 Search the mailing list at Gmane query http://search.gmane.org/?group=$group=gmane.comp.kde.cvs