diff options
Diffstat (limited to 'starter')
| -rw-r--r-- | starter/CMakeLists.txt | 58 | ||||
| -rw-r--r-- | starter/Makefile.am | 2 | ||||
| -rw-r--r-- | starter/configdialog.ui (renamed from starter/config.ui) | 9 | ||||
| -rw-r--r-- | starter/menu.cpp | 4 | ||||
| -rw-r--r-- | starter/menu.h | 2 | ||||
| -rw-r--r-- | starter/starter.cpp | 16 | ||||
| -rw-r--r-- | starter/starter.h | 2 | ||||
| -rw-r--r-- | starter/starterconfig.ui | 6 |
8 files changed, 73 insertions, 26 deletions
diff --git a/starter/CMakeLists.txt b/starter/CMakeLists.txt new file mode 100644 index 0000000..1a2df3d --- /dev/null +++ b/starter/CMakeLists.txt @@ -0,0 +1,58 @@ + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} + ${X11_XTEST_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIBRARY_DIRS} + ${X11_LIBRARY_DIRS} + ${X11_XTEST_LIBRARY_DIRS} +) + + +##### baghirastarter (shared) + +tde_add_library( baghirastarter SHARED AUTOMOC + + SOURCES + starterconfig.ui + starterhelp.ui + configdialog.ui + help.ui + linkconfig.ui + starteriface.skel + baghiralinkdrag.cpp + menu.cpp starter.cpp + LINK + tdeui-shared + tdecore-shared + tdeio-shared + ${X11_XTEST_LIBRARIES} + + DESTINATION ${LIB_INSTALL_DIR} +) + + +##### icons + +tde_install_icons() + + +##### other data + +install( + FILES ../imagebase/poof.png + DESTINATION ${DATA_INSTALL_DIR}/baghira +) + +tde_create_translated_desktop( + SOURCE starter.desktop + DESTINATION ${DATA_INSTALL_DIR}/kicker/applets +) diff --git a/starter/Makefile.am b/starter/Makefile.am index 093b967..112f4f9 100644 --- a/starter/Makefile.am +++ b/starter/Makefile.am @@ -4,7 +4,7 @@ KDE_ICON = AUTO lib_LTLIBRARIES = libbaghirastarter.la -libbaghirastarter_la_SOURCES = baghiralinkdrag.cpp menu.cpp starter.cpp starterconfig.ui starterhelp.ui config.ui help.ui linkconfig.ui starteriface.skel +libbaghirastarter_la_SOURCES = baghiralinkdrag.cpp menu.cpp starter.cpp starterconfig.ui starterhelp.ui configdialog.ui help.ui linkconfig.ui starteriface.skel libbaghirastarter_la_LDFLAGS = -module -avoid-version $(all_libraries) libbaghirastarter_la_LIBADD = -lXtst $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) -ltdefx -lDCOP diff --git a/starter/config.ui b/starter/configdialog.ui index 279974e..b8d52bb 100644 --- a/starter/config.ui +++ b/starter/configdialog.ui @@ -557,19 +557,10 @@ <includehints> <includehint>kcombobox.h</includehint> <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>klineedit.h</includehint> <includehint>kicondialog.h</includehint> - <includehint>klineedit.h</includehint> <includehint>ktextedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> <includehint>kkeybutton.h</includehint> </includehints> </UI> diff --git a/starter/menu.cpp b/starter/menu.cpp index cae0206..a730b51 100644 --- a/starter/menu.cpp +++ b/starter/menu.cpp @@ -46,7 +46,7 @@ //#include "kdrawer.h" #include "baghiralinkdrag.h" #include "menu.h" -#include "config.h" +#include "configdialog.h" #include "help.h" #include "linkconfig.h" #define OPAQUE 0xffffffff @@ -2247,3 +2247,5 @@ bool StartMenu::eventFilter ( TQObject * o, TQEvent * e ) } return false; } + +#include "menu.moc" diff --git a/starter/menu.h b/starter/menu.h index 98a6e63..7e7b044 100644 --- a/starter/menu.h +++ b/starter/menu.h @@ -3,7 +3,7 @@ #define STARTMENU_H #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #include <tqpoint.h> diff --git a/starter/starter.cpp b/starter/starter.cpp index e411b77..df333e2 100644 --- a/starter/starter.cpp +++ b/starter/starter.cpp @@ -7,7 +7,7 @@ #include <tdeconfig.h> #include <tdemessagebox.h> #include <tdeapplication.h> -# include <tdepopupmenu.h> +#include <tdepopupmenu.h> #include <tqimage.h> #include <tqfile.h> #include <tqlabel.h> @@ -228,9 +228,9 @@ void starter::reloadImages() pth = configDialog->BaseURL->url(); else pth = iLoader->iconPath("bStarter", TDEIcon::Small, true); - if (pth) + if (!pth.isEmpty()) pixmap = TQImage(pth); - if (!pth || pixmap.isNull()) + if (pth.isEmpty() || pixmap.isNull()) { pixmap = TQPixmap(22,22); pixmap.fill(TQt::black); @@ -240,9 +240,9 @@ void starter::reloadImages() pth = configDialog->HoverURL->url(); else pth = iLoader->iconPath("bStarter_hover", TDEIcon::Small, true); - if (pth) + if (!pth.isEmpty()) hoverPixmap = TQImage(pth); - if (!pth || hoverPixmap.isNull()) + if (pth.isEmpty() || hoverPixmap.isNull()) { hoverPixmap = TQPixmap(22,22); hoverPixmap.fill(TQt::black); @@ -252,9 +252,9 @@ void starter::reloadImages() pth = configDialog->DownURL->url(); else pth = iLoader->iconPath("bStarter_down", TDEIcon::Small, true); - if (pth) + if (!pth.isEmpty()) downPixmap = TQImage(pth); - if (!pth || downPixmap.isNull()) + if (pth.isEmpty() || downPixmap.isNull()) { downPixmap = TQPixmap(22,22); downPixmap.fill(TQt::white); @@ -481,3 +481,5 @@ extern "C" parent, "baghirastarter"); } } + +#include "starter.moc" diff --git a/starter/starter.h b/starter/starter.h index 52352b6..3cbd14a 100644 --- a/starter/starter.h +++ b/starter/starter.h @@ -3,7 +3,7 @@ #define STARTER_H #ifdef HAVE_CONFIG_H -#include <config.h> +#include "config.h" #endif #include <kpanelapplet.h> diff --git a/starter/starterconfig.ui b/starter/starterconfig.ui index fd3f056..ad0bd72 100644 --- a/starter/starterconfig.ui +++ b/starter/starterconfig.ui @@ -861,12 +861,6 @@ <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> - <includehint>kurlrequester.h</includehint> - <includehint>klineedit.h</includehint> - <includehint>kpushbutton.h</includehint> <includehint>kkeybutton.h</includehint> </includehints> </UI> |