.gitignore @@ -1,5 +1,22 @@ project(kdelicious) cmake_minimum_required(VERSION 2.6) -find_package(Qt4 REQUIRED) +find_package(KDE4 REQUIRED) + +include(KDE4Defaults) +include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) + +set(kdelicious_SRCS + kdeliciousplugin.cpp + createbookmarkdialog.cpp) + +set(kdelicious_UI + newbookmarkwidget.ui) + +kde4_add_ui_files(kdelicious_SRCS ${kdelicioust_UI}) +kde4_add_plugin(kdelicious ${kdelicious_SRCS}) + +target_link_libraries(kdelicious ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KHML_LIBS} ${KDE4_KPARTS_LIBS}) + +install(TARGETS kdelicious DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES plugin_kdelicious.rc plugin_kdelicious.desktop DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins) -add_subdirectory(src) CMakeLists.txt @@ -24,20 +24,14 @@ KDeliciousPlugin::KDeliciousPlugin(QObject *parent, const QVariantList &args) if( parent ) m_parent = dynamic_cast<KParts::ReadOnlyPart*>(parent); - m_wallet = KWallet::Wallet::openWallet( KWallet::Wallet::LocalWallet(), 0 ); - if( !m_wallet->setFolder( "kdelicious" ) ) - { - m_wallet->createFolder( "kdelicious" ); - m_wallet->setFolder( "kdelicious" ); - } - - KActionMenu *menu = new KActionMenu( KIcon("configure"), i18n("del.icio.us Settings"), + KActionMenu *menu = new KActionMenu( KIcon("bookmarks-organize.png"), i18n("del.icio.us Settings"), actionCollection() ); actionCollection()->addAction( "kdelicious menu", menu ); menu->setDelayed( false ); KAction *kaction; kaction = actionCollection()->addAction( "delicioustag" ); + kaction->setIcon( KIcon("bookmarks-organize.png") ); kaction->setText( i18n("&Tag this site...") ); menu->addAction( kaction ); connect( kaction, SIGNAL(triggered(bool)), kdeliciousplugin.cpp @@ -13,4 +13,4 @@ X-KDE-PluginInfo-EnabledByDefault=false X-KDE-ParentApp=konqueror Name=KDelicious Comment=Provides easy access to del.icio.us features within Konqueror -Icon=configure +Icon=bookmarks-organize.png plugin_kdelicious.desktop @@ -5,4 +5,7 @@ <Action name="kdelicious menu"/> </Menu> </MenuBar> +<ToolBar name="extraToolBar"><text>Extra Toolbar</text> + <Action name="delicioustag"/> +</ToolBar> </gui> plugin_kdelicious.rc CMakeCache.txt CMakeFiles/CMakeCCompiler.cmake CMakeFiles/CMakeCXXCompiler.cmake CMakeFiles/CMakeDetermineCompilerABI_C.bin CMakeFiles/CMakeDetermineCompilerABI_CXX.bin CMakeFiles/CMakeDirectoryInformation.cmake CMakeFiles/CMakeError.log CMakeFiles/CMakeOutput.log CMakeFiles/CMakeRuleHashes.txt CMakeFiles/CMakeSystem.cmake CMakeFiles/CompilerIdC/CMakeCCompilerId.c CMakeFiles/CompilerIdC/a.out CMakeFiles/CompilerIdCXX/CMakeCXXCompilerId.cpp CMakeFiles/CompilerIdCXX/a.out CMakeFiles/Makefile.cmake CMakeFiles/Makefile2 CMakeFiles/cmake.check_cache CMakeFiles/kdelicious.dir/CXX.includecache CMakeFiles/kdelicious.dir/DependInfo.cmake CMakeFiles/kdelicious.dir/build.make CMakeFiles/kdelicious.dir/cmake_clean.cmake CMakeFiles/kdelicious.dir/createbookmarkdialog.o CMakeFiles/kdelicious.dir/depend.internal CMakeFiles/kdelicious.dir/depend.make CMakeFiles/kdelicious.dir/flags.make CMakeFiles/kdelicious.dir/kdelicious_automoc.o CMakeFiles/kdelicious.dir/kdeliciousplugin.o CMakeFiles/kdelicious.dir/link.txt CMakeFiles/kdelicious.dir/progress.make CMakeFiles/kdelicious_automoc.dir/DependInfo.cmake CMakeFiles/kdelicious_automoc.dir/build.make CMakeFiles/kdelicious_automoc.dir/cmake_clean.cmake CMakeFiles/kdelicious_automoc.dir/depend.internal CMakeFiles/kdelicious_automoc.dir/depend.make CMakeFiles/kdelicious_automoc.dir/progress.make CMakeFiles/kdeliciousplugin.dir/CXX.includecache CMakeFiles/kdeliciousplugin.dir/DependInfo.cmake CMakeFiles/kdeliciousplugin.dir/build.make CMakeFiles/kdeliciousplugin.dir/cmake_clean.cmake CMakeFiles/kdeliciousplugin.dir/createbookmarkdialog.o CMakeFiles/kdeliciousplugin.dir/depend.internal CMakeFiles/kdeliciousplugin.dir/depend.make CMakeFiles/kdeliciousplugin.dir/flags.make CMakeFiles/kdeliciousplugin.dir/kdeliciousplugin.o CMakeFiles/kdeliciousplugin.dir/kdeliciousplugin_automoc.o CMakeFiles/kdeliciousplugin.dir/link.txt CMakeFiles/kdeliciousplugin.dir/progress.make CMakeFiles/kdeliciousplugin_automoc.dir/DependInfo.cmake CMakeFiles/kdeliciousplugin_automoc.dir/build.make CMakeFiles/kdeliciousplugin_automoc.dir/cmake_clean.cmake CMakeFiles/kdeliciousplugin_automoc.dir/depend.internal CMakeFiles/kdeliciousplugin_automoc.dir/depend.make CMakeFiles/kdeliciousplugin_automoc.dir/progress.make CMakeFiles/progress.make CMakeFiles/uninstall.dir/DependInfo.cmake CMakeFiles/uninstall.dir/build.make CMakeFiles/uninstall.dir/cmake_clean.cmake CMakeFiles/uninstall.dir/progress.make kdelicious.kdev4 kdelicious_automoc.cpp.files kdeliciousplugin.desktop kdeliciousplugin.rc kdeliciousplugin_automoc.cpp.files lib/kdelicious.so lib/kdeliciousplugin.so moc_kdeliciousplugin.cpp af930a6a325498002910ee0957dc9da4a2fb2589 Gregory Haynes greg@greghaynes.net http://github.com/greghaynes/kdelicious/commit/28325aa5b6b75e6fe6e0a4f07378119443be3cdc 28325aa5b6b75e6fe6e0a4f07378119443be3cdc 2009-04-06T16:07:47-07:00 2009-04-06T16:07:47-07:00 Added konqueror menus. e8aa14dd36f92f902b7cf1581451b2dc3dfad89e Gregory Haynes greg@greghaynes.net