From 64df902cf71a8ee258fb85f6be26248f399aa01f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:05:15 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- korganizer/printing/CMakeLists.txt | 2 +- korganizer/printing/Makefile.am | 2 +- korganizer/printing/calprintdefaultplugins.cpp | 4 +- korganizer/printing/calprintpluginbase.cpp | 2 +- korganizer/printing/calprintweekconfig_base.ui | 300 ----------------------- korganizer/printing/calprintweetdeconfig_base.ui | 300 +++++++++++++++++++++++ 6 files changed, 305 insertions(+), 305 deletions(-) delete mode 100644 korganizer/printing/calprintweekconfig_base.ui create mode 100644 korganizer/printing/calprintweetdeconfig_base.ui (limited to 'korganizer/printing') diff --git a/korganizer/printing/CMakeLists.txt b/korganizer/printing/CMakeLists.txt index 67ff04850..bb4fce149 100644 --- a/korganizer/printing/CMakeLists.txt +++ b/korganizer/printing/CMakeLists.txt @@ -46,7 +46,7 @@ tde_add_library( korg_stdprinting SHARED AUTOMOC SOURCES calprinter.cpp calprintpluginbase.cpp calprintdefaultplugins.cpp calprintdayconfig_base.ui calprintmonthconfig_base.ui - calprinttodoconfig_base.ui calprintweekconfig_base.ui + calprinttodoconfig_base.ui calprintweetdeconfig_base.ui calprintincidenceconfig_base.ui VERSION 1.0.0 LINK kocorehelper-shared tdeprint-shared diff --git a/korganizer/printing/Makefile.am b/korganizer/printing/Makefile.am index 10170ca74..45fd37be2 100644 --- a/korganizer/printing/Makefile.am +++ b/korganizer/printing/Makefile.am @@ -18,7 +18,7 @@ libkocorehelper_la_SOURCES = cellitem.cpp libkorg_stdprinting_la_SOURCES = calprinter.cpp calprintpluginbase.cpp \ calprintdefaultplugins.cpp \ calprintdayconfig_base.ui calprintmonthconfig_base.ui \ - calprinttodoconfig_base.ui calprintweekconfig_base.ui \ + calprinttodoconfig_base.ui calprintweetdeconfig_base.ui \ calprintincidenceconfig_base.ui libkorg_stdprinting_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) \ -no-undefined -version-info 1:0 diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp index e67015545..8ed37660c 100644 --- a/korganizer/printing/calprintdefaultplugins.cpp +++ b/korganizer/printing/calprintdefaultplugins.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include @@ -45,7 +45,7 @@ #include "calprintincidenceconfig_base.h" #include "calprintdayconfig_base.h" -#include "calprintweekconfig_base.h" +#include "calprintweetdeconfig_base.h" #include "calprintmonthconfig_base.h" #include "calprinttodoconfig_base.h" diff --git a/korganizer/printing/calprintpluginbase.cpp b/korganizer/printing/calprintpluginbase.cpp index 50b533bf6..f754e52df 100644 --- a/korganizer/printing/calprintpluginbase.cpp +++ b/korganizer/printing/calprintpluginbase.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/korganizer/printing/calprintweekconfig_base.ui b/korganizer/printing/calprintweekconfig_base.ui deleted file mode 100644 index 0be844abb..000000000 --- a/korganizer/printing/calprintweekconfig_base.ui +++ /dev/null @@ -1,300 +0,0 @@ - -CalPrintWeekConfig_Base -Configuration page for the print week mode. -Reinhold Kainhofer <reinhold@kainhofer.com> - - - CalPrintWeek_Base - - - - 0 - 0 - 386 - 262 - - - - CalPrintWeek_Base - - - - unnamed - - - 0 - - - - spacer3 - - - Vertical - - - Expanding - - - - 21 - 27 - - - - - - mDateRangeGroup - - - Date && Time Range - - - - unnamed - - - - spacer1 - - - Horizontal - - - Expanding - - - - 16 - 21 - - - - - - mFromDateLabel - - - &Start date: - - - mFromDate - - - Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the <i>End date</i> to enter the end date of the daterange. - - - - - mFromDate - - - StrongFocus - - - Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the <i>End date</i> to enter the end date of the daterange. - - - - - mToTimeLabel - - - End ti&me: - - - mToTime - - - All events which start later than the given time will not be printed. - - - - - spacer4 - - - Horizontal - - - Expanding - - - - 110 - 20 - - - - - - mToTime - - - - - - Minutes|Hours - - - All events which start later than the given time will not be printed. - - - - - mFromTimeLabel - - - Start &time: - - - mFromTime - - - All events which start earlier than the given time will not be printed. - - - - - mFromTime - - - - - - Minutes|Hours - - - All events which start earlier than the given time will not be printed. - - - - - mToDate - - - StrongFocus - - - Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the <i>Start date</i> to enter the start date of the daterange. - - - - - mToDateLabel - - - &End date: - - - mToDate - - - Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the <i>Start date</i> to enter the start date of the daterange. - - - - - - - mColors - - - &Use colors - - - The timetable view supports colors. If you want to make use of colors you should check this option. The category colors will be used. - - - - - mPrintType - - - Print Layout - - - - unnamed - - - - mPrintTypeButton1 - - - Print as &Filofax page - - - true - - - The Filofax view prints one week per page, so all days have a large surface. - - - - - mPrintTypeButton2 - - - Print as &timetable view - - - This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check <i>Use Colors</i>. - - - - - mPrintTypeButton3 - - - Print as split week view - - - This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait. - - - - - - - mIncludeTodos - - - false - - - Include to-&dos that are due on the printed day(s) - - - Check this option if you want to have to-dos on the print, placed by their due date. - - - - - - - - mFromDate - mFromTime - mToDate - mToTime - mPrintTypeButton1 - mIncludeTodos - mColors - - - kdateedit.h - - - - libtdepim/kdateedit.h - libtdepim/kdateedit.h - - diff --git a/korganizer/printing/calprintweetdeconfig_base.ui b/korganizer/printing/calprintweetdeconfig_base.ui new file mode 100644 index 000000000..0be844abb --- /dev/null +++ b/korganizer/printing/calprintweetdeconfig_base.ui @@ -0,0 +1,300 @@ + +CalPrintWeekConfig_Base +Configuration page for the print week mode. +Reinhold Kainhofer <reinhold@kainhofer.com> + + + CalPrintWeek_Base + + + + 0 + 0 + 386 + 262 + + + + CalPrintWeek_Base + + + + unnamed + + + 0 + + + + spacer3 + + + Vertical + + + Expanding + + + + 21 + 27 + + + + + + mDateRangeGroup + + + Date && Time Range + + + + unnamed + + + + spacer1 + + + Horizontal + + + Expanding + + + + 16 + 21 + + + + + + mFromDateLabel + + + &Start date: + + + mFromDate + + + Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the <i>End date</i> to enter the end date of the daterange. + + + + + mFromDate + + + StrongFocus + + + Here you can choose which events should be printed based on their date. This check enables you to enter the start date of the date range. Use the <i>End date</i> to enter the end date of the daterange. + + + + + mToTimeLabel + + + End ti&me: + + + mToTime + + + All events which start later than the given time will not be printed. + + + + + spacer4 + + + Horizontal + + + Expanding + + + + 110 + 20 + + + + + + mToTime + + + + + + Minutes|Hours + + + All events which start later than the given time will not be printed. + + + + + mFromTimeLabel + + + Start &time: + + + mFromTime + + + All events which start earlier than the given time will not be printed. + + + + + mFromTime + + + + + + Minutes|Hours + + + All events which start earlier than the given time will not be printed. + + + + + mToDate + + + StrongFocus + + + Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the <i>Start date</i> to enter the start date of the daterange. + + + + + mToDateLabel + + + &End date: + + + mToDate + + + Here you can choose which events should be printed based on their date. This check enables you to enter the end date of the date range. Use the <i>Start date</i> to enter the start date of the daterange. + + + + + + + mColors + + + &Use colors + + + The timetable view supports colors. If you want to make use of colors you should check this option. The category colors will be used. + + + + + mPrintType + + + Print Layout + + + + unnamed + + + + mPrintTypeButton1 + + + Print as &Filofax page + + + true + + + The Filofax view prints one week per page, so all days have a large surface. + + + + + mPrintTypeButton2 + + + Print as &timetable view + + + This view is similar to the weekview in KOrganizer. The week is printed in landscape layout. You can even use the same colors for the items if you check <i>Use Colors</i>. + + + + + mPrintTypeButton3 + + + Print as split week view + + + This view is similar to the week view in KOrganizer. The only difference with the timetable view is the page layout. Timetables are printed in landscape, the split week view in portrait. + + + + + + + mIncludeTodos + + + false + + + Include to-&dos that are due on the printed day(s) + + + Check this option if you want to have to-dos on the print, placed by their due date. + + + + + + + + mFromDate + mFromTime + mToDate + mToTime + mPrintTypeButton1 + mIncludeTodos + mColors + + + kdateedit.h + + + + libtdepim/kdateedit.h + libtdepim/kdateedit.h + + -- cgit v1.2.1