kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix servicemenus now that they are parsed by KService: they need Type=Service.

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=725978
This commit is contained in:
David Faure 2007-10-16 19:18:42 +00:00
parent b1cbcdbe52
commit e90260c43a
20 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
konqueror/quickprint/text-ada-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-adasrc
Actions=Print;

1
konqueror/quickprint/text-c++-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-c++src
Actions=Print;

1
konqueror/quickprint/text-c++h-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-c++hdr
Actions=Print;

1
konqueror/quickprint/text-c-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-csrc
Actions=Print;

1
konqueror/quickprint/text-ch-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-chdr
Actions=Print;

1
konqueror/quickprint/text-css-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/css
Actions=Print;

1
konqueror/quickprint/text-diff-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-patch
Actions=Print;

1
konqueror/quickprint/text-html-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/html
Actions=Print;

1
konqueror/quickprint/text-java-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-java
Actions=Print;

1
konqueror/quickprint/text-log-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-log
Actions=Print;

1
konqueror/quickprint/text-makefile-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-makefile
Actions=Print;

1
konqueror/quickprint/text-pas-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-pascal
Actions=Print;

1
konqueror/quickprint/text-perl-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-perl
Actions=Print;

1
konqueror/quickprint/text-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/plain
Actions=Print;

1
konqueror/quickprint/text-python-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-python
Actions=Print;

1
konqueror/quickprint/text-tcl-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-tcl
Actions=Print;

1
konqueror/quickprint/text-tex-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-tex
Actions=Print;

1
konqueror/quickprint/text-xml-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=text/x-xml
Actions=Print;

1
konqueror/quickprint/text-xslt-print.desktop
View file

@ -1,5 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
Type=Service
ServiceTypes=application/xslt+xml
Actions=Print;

13
lib/konq/tests/konqpopupmenutest.cpp
View file

@ -41,6 +41,7 @@ static QStringList extractActionNames(const QMenu& menu)
if (action->isSeparator()) {
ret.append("separator");
} else if (action->objectName().isEmpty()) {
//qDebug() << action->metaObject()->className();
Q_ASSERT(action->menu());
ret.append("submenu");
} else {
@ -66,11 +67,11 @@ void KonqPopupMenuTest::initTestCase()
m_pasteTo = KStandardAction::paste(0, 0, this);
m_actionCollection.addAction("pasteto", m_pasteTo);
m_back = new QAction(this);
m_actionCollection.addAction("back", m_back);
m_actionCollection.addAction("go_back", m_back);
m_forward = new QAction(this);
m_actionCollection.addAction("forward", m_forward);
m_actionCollection.addAction("go_forward", m_forward);
m_up = new QAction(this);
m_actionCollection.addAction("up", m_up);
m_actionCollection.addAction("go_up", m_up);
m_reload = new QAction(this);
m_actionCollection.addAction("reload", m_reload);
m_properties = new QAction(this);
@ -122,7 +123,7 @@ void KonqPopupMenuTest::initTestCase()
subMenu->addAction(m_up);
QStringList actions = extractActionNames(popup);
kDebug() << actions;
QCOMPARE(actions, QStringList() << "back" << "submenu");
QCOMPARE(actions, QStringList() << "go_back" << "submenu");
}
void KonqPopupMenuTest::testFile()
@ -237,7 +238,7 @@ void KonqPopupMenuTest::testViewDirectory()
actions.replaceInStrings("openwith", "openWith_submenu");
QCOMPARE(actions, QStringList()
<< "newmenu" << "separator"
<< "up" << "back" << "forward" << "separator"
<< "go_up" << "go_back" << "go_forward" << "separator"
<< "paste" << "separator"
<< "openWith_submenu"
<< "preview_submenu"
@ -307,7 +308,7 @@ void KonqPopupMenuTest::testHtmlPage()
QStringList actions = extractActionNames(popup);
kDebug() << actions;
QCOMPARE(actions, QStringList()
<< "back" << "forward" << "reload" << "separator"
<< "go_back" << "go_forward" << "reload" << "separator"
<< "bookmark_add"
<< "separator"
<< "openWith_submenu"