Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2014-03-30 07:51:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2014-03-18 16:02:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2014-03-30 08:24:49.000000000 +0200 @@ -1,0 +2,14 @@ +Thu Mar 27 17:38:01 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.12.97 + * KDE 4.13 RC release + * See http://www.kde.org/announcements/announce-4.13-rc.php + +------------------------------------------------------------------- +Thu Mar 20 18:04:07 UTC 2014 - tittiatc...@gmail.com + +- Update to 4.12.95 + * KDE 4.13 Beta 3 release + * See http://www.kde.org/announcements/announce-4.13-beta3.php + +------------------------------------------------------------------- Old: ---- kde-baseapps-4.12.90.tar.xz New: ---- kde-baseapps-4.12.97.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.Zjb6Xa/_old 2014-03-30 08:27:59.000000000 +0200 +++ /var/tmp/diff_new_pack.Zjb6Xa/_new 2014-03-30 08:27:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4 -Version: 4.12.90 +Version: 4.12.97 Release: 0 Summary: The Base KDE Apps License: GPL-2.0+ ++++++ kde-baseapps-4.12.90.tar.xz -> kde-baseapps-4.12.97.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.90/dolphin/src/search/dolphinfacetswidget.cpp new/kde-baseapps-4.12.97/dolphin/src/search/dolphinfacetswidget.cpp --- old/kde-baseapps-4.12.90/dolphin/src/search/dolphinfacetswidget.cpp 2014-03-11 09:07:23.000000000 +0100 +++ new/kde-baseapps-4.12.97/dolphin/src/search/dolphinfacetswidget.cpp 2014-03-25 23:39:47.000000000 +0100 @@ -46,13 +46,16 @@ m_fourOrMore(0), m_maxRating(0) { - m_documents = createCheckBox(i18nc("@option:check", "Documents")); - m_images = createCheckBox(i18nc("@option:check", "Images")); - m_audio = createCheckBox(i18nc("@option:check", "Audio Files")); - m_videos = createCheckBox(i18nc("@option:check", "Videos")); + QButtonGroup* filetypeGroup = new QButtonGroup(this); + m_anyType = createRadioButton(i18nc("@option:check", "Any"), filetypeGroup); + m_documents = createRadioButton(i18nc("@option:check", "Documents"), filetypeGroup); + m_images = createRadioButton(i18nc("@option:check", "Images"), filetypeGroup); + m_audio = createRadioButton(i18nc("@option:check", "Audio Files"), filetypeGroup); + m_videos = createRadioButton(i18nc("@option:check", "Videos"), filetypeGroup); QVBoxLayout* typeLayout = new QVBoxLayout(); typeLayout->setSpacing(0); + typeLayout->addWidget(m_anyType); typeLayout->addWidget(m_documents); typeLayout->addWidget(m_images); typeLayout->addWidget(m_audio); @@ -100,6 +103,7 @@ topLayout->addLayout(ratingLayout); topLayout->addStretch(); + m_anyType->setChecked(true); m_anytime->setChecked(true); m_anyRating->setChecked(true); } @@ -111,6 +115,9 @@ #ifdef HAVE_BALOO Baloo::Term DolphinFacetsWidget::ratingTerm() const { + Baloo::Term ratingTerm; + Baloo::Term modifiedTerm; + if (!m_anyRating->isChecked()) { int stars = 1; // represents m_oneOrMore if (m_twoOrMore->isChecked()) { @@ -124,15 +131,9 @@ } const int rating = stars * 2; - - Baloo::Term term("rating", rating, Baloo::Term::GreaterEqual); - return term; + ratingTerm = Baloo::Term("rating", rating, Baloo::Term::GreaterEqual); } - return Baloo::Term(); - - /* - // FIXME: Handle date time filters if (!m_anytime->isChecked()) { QDate date = QDate::currentDate(); // represents m_today if (m_yesterday->isChecked()) { @@ -145,46 +146,42 @@ date = date.addDays(1 - date.dayOfYear()); } - Nepomuk2::Query::ComparisonTerm term(Nepomuk2::Vocabulary::NIE::lastModified(), - Nepomuk2::Query::LiteralTerm(QDateTime(date)), - Nepomuk2::Query::ComparisonTerm::GreaterOrEqual); - andTerm.addSubTerm(term); + modifiedTerm = Baloo::Term("modified", date, Baloo::Term::GreaterEqual); } - */ -} -QStringList DolphinFacetsWidget::facetTypes() const -{ - QStringList types; - if (m_documents->isChecked()) { - types << "Document"; - } + if (ratingTerm.isValid() && modifiedTerm.isValid()) { + Baloo::Term term(Baloo::Term::And); + term.addSubTerm(ratingTerm); + term.addSubTerm(modifiedTerm); - if (m_images->isChecked()) { - types << "Image"; + return term; + } else if (modifiedTerm.isValid()) { + return modifiedTerm; + } else if (ratingTerm.isValid()) { + return ratingTerm; } - if (m_audio->isChecked()) { - types << "Audio"; - } + return Baloo::Term(); +} - if (m_videos->isChecked()) { - types << "Video"; +QString DolphinFacetsWidget::facetType() const +{ + if (m_documents->isChecked()) { + return QLatin1String("Document"); + } else if (m_images->isChecked()) { + return QLatin1String("Image"); + } else if (m_audio->isChecked()) { + return QLatin1String("Audio"); + } else if (m_videos->isChecked()) { + return QLatin1String("Video"); } - return types; + return QString(); } #endif -QCheckBox* DolphinFacetsWidget::createCheckBox(const QString& text) -{ - QCheckBox* checkBox = new QCheckBox(text); - connect(checkBox, SIGNAL(clicked()), this, SIGNAL(facetChanged())); - return checkBox; -} - QRadioButton* DolphinFacetsWidget::createRadioButton(const QString& text, QButtonGroup* group) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.90/dolphin/src/search/dolphinfacetswidget.h new/kde-baseapps-4.12.97/dolphin/src/search/dolphinfacetswidget.h --- old/kde-baseapps-4.12.90/dolphin/src/search/dolphinfacetswidget.h 2014-03-11 09:07:23.000000000 +0100 +++ new/kde-baseapps-4.12.97/dolphin/src/search/dolphinfacetswidget.h 2014-03-25 23:39:47.000000000 +0100 @@ -57,7 +57,7 @@ #ifdef HAVE_BALOO Baloo::Term ratingTerm() const; - QStringList facetTypes() const; + QString facetType() const; #endif signals: @@ -65,13 +65,6 @@ private: /** - * @return New checkbox which is connected to the - * slotFacedChanged() slot whenever it has - * been toggled. - */ - QCheckBox* createCheckBox(const QString& text); - - /** * @return New radiobutton which is connected to the * slotFacedChanged() slot whenever it has * been toggled. @@ -80,10 +73,11 @@ QButtonGroup* group); private: - QCheckBox* m_documents; - QCheckBox* m_images; - QCheckBox* m_audio; - QCheckBox* m_videos; + QRadioButton* m_anyType; + QRadioButton* m_documents; + QRadioButton* m_images; + QRadioButton* m_audio; + QRadioButton* m_videos; QRadioButton* m_anytime; QRadioButton* m_today; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.90/dolphin/src/search/dolphinsearchbox.cpp new/kde-baseapps-4.12.97/dolphin/src/search/dolphinsearchbox.cpp --- old/kde-baseapps-4.12.90/dolphin/src/search/dolphinsearchbox.cpp 2014-03-11 09:07:23.000000000 +0100 +++ new/kde-baseapps-4.12.97/dolphin/src/search/dolphinsearchbox.cpp 2014-03-25 23:39:47.000000000 +0100 @@ -436,7 +436,7 @@ Baloo::Query query; query.addType("File"); - query.addTypes(m_facetsWidget->facetTypes()); + query.addType(m_facetsWidget->facetType()); Baloo::Term term(Baloo::Term::And); @@ -447,14 +447,16 @@ if (m_contentButton->isChecked()) { query.setSearchString(text); - } else { - term.addSubTerm(Baloo::Term("filename", text)); + } else if (!text.isEmpty()) { + term.addSubTerm(Baloo::Term(QLatin1String("filename"), text)); } if (m_fromHereButton->isChecked()) { query.addCustomOption("includeFolder", m_searchPath.toLocalFile()); } + query.setTerm(term); + return query.toSearchUrl(i18nc("@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the user entered.", "Query Results from '%1'", text)); #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.90/dolphin/src/search/filenamesearchprotocol.cpp new/kde-baseapps-4.12.97/dolphin/src/search/filenamesearchprotocol.cpp --- old/kde-baseapps-4.12.90/dolphin/src/search/filenamesearchprotocol.cpp 2014-03-11 09:07:23.000000000 +0100 +++ new/kde-baseapps-4.12.97/dolphin/src/search/filenamesearchprotocol.cpp 2014-03-25 23:39:47.000000000 +0100 @@ -91,8 +91,11 @@ bool addItem = false; if (!m_regExp || item.name().contains(*m_regExp)) { addItem = true; - } else if (m_checkContent && item.mimetype().startsWith(QLatin1String("text/"))) { + } else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) { + qDebug() << "### Checking" << item; addItem = contentContainsPattern(item.url()); + } else { + qDebug() << "### NOT Checking" << item; } if (addItem) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.12.90/konqueror/profile_kde_devel.desktop new/kde-baseapps-4.12.97/konqueror/profile_kde_devel.desktop --- old/kde-baseapps-4.12.90/konqueror/profile_kde_devel.desktop 2014-03-11 09:07:23.000000000 +0100 +++ new/kde-baseapps-4.12.97/konqueror/profile_kde_devel.desktop 2014-03-25 23:39:47.000000000 +0100 @@ -107,7 +107,7 @@ ViewT1_ServiceName=khtml ViewT1_ServiceType=text/html ViewT1_ToggleView=false -ViewT1_URL=http://doc.trolltech.com/ +ViewT1_URL=http://qt-project.org/doc/ ViewT2_LinkedView=false ViewT2_LockedLocation=false ViewT2_PassiveMode=false -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
