Merge lp://qastaging/~gotwig/gazette/global-service-states into lp://qastaging/gazette

Proposed by Eduard Gotwig
Status: Work in progress
Proposed branch: lp://qastaging/~gotwig/gazette/global-service-states
Merge into: lp://qastaging/gazette
Diff against target: 8733 lines (+6419/-1033) (has conflicts)
140 files modified
CMakeLists.txt (+9/-31)
data/gazette.desktop (+9/-0)
data/org.pantheon.gazette.gschema.xml (+14/-48)
lib/CMakeLists.txt (+19/-0)
lib/Configurable.vala (+6/-0)
lib/Plugin.vala (+46/-0)
lib/Service.vala (+162/-0)
lib/ShadowedLabel.vala (+104/-0)
plug/CMakeLists.txt (+12/-8)
plug/GeneralConfigBox.vala (+94/-0)
plug/PluginConfigBox.vala (+206/-0)
plug/gazette.plug (+2/-2)
plug/main.vala (+24/-85)
plugins/CMakeLists.txt (+7/-0)
plugins/Calendar/CMakeLists.txt (+16/-0)
plugins/Calendar/Calendar.vala (+74/-0)
plugins/Calendar/calendar.plug (+3/-0)
plugins/Files/CMakeLists.txt (+16/-0)
plugins/Files/Files.vala (+38/-0)
plugins/Files/files.plug (+3/-0)
plugins/News/CMakeLists.txt (+17/-0)
plugins/News/News.vala (+96/-0)
plugins/News/data/news.gschema.xml (+8/-0)
plugins/News/news.plug (+3/-0)
plugins/Time/CMakeLists.txt (+15/-0)
plugins/Time/Time.vala (+36/-0)
plugins/Time/time.plug (+3/-0)
plugins/Weather/CMakeLists.txt (+19/-0)
plugins/Weather/Weather.vala (+274/-0)
plugins/Weather/data/weather.gschema.xml (+17/-0)
plugins/Weather/weather.plug (+3/-0)
po/CMakeLists.txt (+7/-2)
po/gazette.pot (+358/-0)
po/lib/CMakeFiles/CMakeDirectoryInformation.cmake (+16/-0)
po/lib/CMakeFiles/gazette-service.dir/DependInfo.cmake (+37/-0)
po/lib/CMakeFiles/gazette-service.dir/build.make (+198/-0)
po/lib/CMakeFiles/gazette-service.dir/cmake_clean.cmake (+17/-0)
po/lib/CMakeFiles/gazette-service.dir/cmake_clean_target.cmake (+3/-0)
po/lib/CMakeFiles/gazette-service.dir/depend.make (+2/-0)
po/lib/CMakeFiles/gazette-service.dir/flags.make (+8/-0)
po/lib/CMakeFiles/gazette-service.dir/link.txt (+2/-0)
po/lib/CMakeFiles/gazette-service.dir/progress.make (+6/-0)
po/lib/CMakeFiles/progress.marks (+1/-0)
po/lib/Makefile (+290/-0)
po/lib/cmake_install.cmake (+46/-0)
po/plug/CMakeFiles/CMakeDirectoryInformation.cmake (+16/-0)
po/plug/CMakeFiles/gazette-plug.dir/DependInfo.cmake (+42/-0)
po/plug/CMakeFiles/gazette-plug.dir/build.make (+232/-0)
po/plug/CMakeFiles/gazette-plug.dir/cmake_clean.cmake (+20/-0)
po/plug/CMakeFiles/gazette-plug.dir/depend.make (+2/-0)
po/plug/CMakeFiles/gazette-plug.dir/flags.make (+8/-0)
po/plug/CMakeFiles/gazette-plug.dir/link.txt (+1/-0)
po/plug/CMakeFiles/gazette-plug.dir/progress.make (+7/-0)
po/plug/CMakeFiles/progress.marks (+1/-0)
po/plug/Makefile (+317/-0)
po/plug/cmake_install.cmake (+66/-0)
po/plugins/CMakeFiles/CMakeDirectoryInformation.cmake (+16/-0)
po/plugins/CMakeFiles/progress.marks (+1/-0)
po/plugins/Files/CMakeFiles/CMakeDirectoryInformation.cmake (+16/-0)
po/plugins/Files/CMakeFiles/files.dir/DependInfo.cmake (+33/-0)
po/plugins/Files/CMakeFiles/files.dir/build.make (+111/-0)
po/plugins/Files/CMakeFiles/files.dir/cmake_clean.cmake (+12/-0)
po/plugins/Files/CMakeFiles/files.dir/depend.make (+2/-0)
po/plugins/Files/CMakeFiles/files.dir/flags.make (+8/-0)
po/plugins/Files/CMakeFiles/files.dir/link.txt (+1/-0)
po/plugins/Files/CMakeFiles/files.dir/progress.make (+3/-0)
po/plugins/Files/CMakeFiles/progress.marks (+1/-0)
po/plugins/Files/Makefile (+209/-0)
po/plugins/Files/cmake_install.cmake (+90/-0)
po/plugins/Makefile (+167/-0)
po/plugins/News/CMakeFiles/CMakeDirectoryInformation.cmake (+16/-0)
po/plugins/News/CMakeFiles/news.dir/DependInfo.cmake (+33/-0)
po/plugins/News/CMakeFiles/news.dir/build.make (+111/-0)
po/plugins/News/CMakeFiles/news.dir/cmake_clean.cmake (+12/-0)
po/plugins/News/CMakeFiles/news.dir/depend.make (+2/-0)
po/plugins/News/CMakeFiles/news.dir/flags.make (+8/-0)
po/plugins/News/CMakeFiles/news.dir/link.txt (+1/-0)
po/plugins/News/CMakeFiles/news.dir/progress.make (+3/-0)
po/plugins/News/CMakeFiles/progress.marks (+1/-0)
po/plugins/News/Makefile (+209/-0)
po/plugins/News/cmake_install.cmake (+90/-0)
po/plugins/Time/CMakeFiles/CMakeDirectoryInformation.cmake (+16/-0)
po/plugins/Time/CMakeFiles/progress.marks (+1/-0)
po/plugins/Time/CMakeFiles/time.dir/DependInfo.cmake (+33/-0)
po/plugins/Time/CMakeFiles/time.dir/build.make (+111/-0)
po/plugins/Time/CMakeFiles/time.dir/cmake_clean.cmake (+12/-0)
po/plugins/Time/CMakeFiles/time.dir/depend.make (+2/-0)
po/plugins/Time/CMakeFiles/time.dir/flags.make (+8/-0)
po/plugins/Time/CMakeFiles/time.dir/link.txt (+1/-0)
po/plugins/Time/CMakeFiles/time.dir/progress.make (+3/-0)
po/plugins/Time/Makefile (+209/-0)
po/plugins/Time/cmake_install.cmake (+70/-0)
po/plugins/Weather/CMakeFiles/CMakeDirectoryInformation.cmake (+16/-0)
po/plugins/Weather/CMakeFiles/progress.marks (+1/-0)
po/plugins/Weather/CMakeFiles/weather.dir/DependInfo.cmake (+33/-0)
po/plugins/Weather/CMakeFiles/weather.dir/build.make (+111/-0)
po/plugins/Weather/CMakeFiles/weather.dir/cmake_clean.cmake (+12/-0)
po/plugins/Weather/CMakeFiles/weather.dir/depend.make (+2/-0)
po/plugins/Weather/CMakeFiles/weather.dir/flags.make (+8/-0)
po/plugins/Weather/CMakeFiles/weather.dir/link.txt (+1/-0)
po/plugins/Weather/CMakeFiles/weather.dir/progress.make (+3/-0)
po/plugins/Weather/Makefile (+209/-0)
po/plugins/Weather/cmake_install.cmake (+90/-0)
po/plugins/cmake_install.cmake (+43/-0)
po/po/CMakeFiles/CMakeDirectoryInformation.cmake (+5/-0)
po/po/CMakeFiles/i18n.dir/DependInfo.cmake (+0/-1)
po/po/CMakeFiles/i18n.dir/build.make (+35/-0)
po/po/CMakeFiles/i18n.dir/progress.make (+1/-1)
po/po/CMakeFiles/pot.dir/DependInfo.cmake (+0/-1)
po/po/CMakeFiles/pot.dir/build.make (+24/-0)
po/po/CMakeFiles/pot.dir/progress.make (+1/-1)
po/po/Makefile (+50/-0)
po/po/cmake_install.cmake (+52/-0)
po/src/CMakeFiles/CMakeDirectoryInformation.cmake (+16/-0)
po/src/CMakeFiles/gazette.dir/DependInfo.cmake (+42/-0)
po/src/CMakeFiles/gazette.dir/build.make (+232/-0)
po/src/CMakeFiles/gazette.dir/cmake_clean.cmake (+20/-0)
po/src/CMakeFiles/gazette.dir/depend.make (+2/-0)
po/src/CMakeFiles/gazette.dir/flags.make (+8/-0)
po/src/CMakeFiles/gazette.dir/link.txt (+1/-0)
po/src/CMakeFiles/gazette.dir/progress.make (+7/-0)
po/src/CMakeFiles/progress.marks (+1/-0)
po/src/Config.vala (+1/-1)
po/src/Makefile (+317/-0)
po/src/cmake_install.cmake (+50/-0)
src/CMakeLists.txt (+22/-0)
src/Gazette.vala (+58/-107)
src/PluginManager.vala (+175/-0)
src/Plugs/RSS.vala (+0/-92)
src/Plugs/RecentFiles.vala (+0/-27)
src/Plugs/Service.vala (+0/-74)
src/Plugs/Weather.vala (+0/-114)
src/Services/Calendar.vala (+0/-76)
src/Services/Files.vala (+0/-54)
src/Services/News.vala (+0/-92)
src/Services/Service.vala (+0/-135)
src/WelcomeMessage.vala (+39/-0)
src/Widgets/GazetteWindow.vala (+0/-1)
src/Widgets/ShadowedLabel.vala (+0/-80)
vapi/Service.vapi (+51/-0)
Text conflict in po/gazette.pot
Text conflict in po/po/CMakeFiles/CMakeDirectoryInformation.cmake
Text conflict in po/po/CMakeFiles/i18n.dir/build.make
Text conflict in po/po/CMakeFiles/pot.dir/build.make
Text conflict in po/po/Makefile
Text conflict in po/po/cmake_install.cmake
Conflict: can't delete src/Services because it is not empty.  Not deleting.
Conflict because src/Services is not versioned, but has versioned children.  Versioned directory.
Contents conflict in src/Services/Weather.vala
To merge this branch: bzr merge lp://qastaging/~gotwig/gazette/global-service-states
Reviewer Review Type Date Requested Status
Gazette Newsies Pending
Review via email: mp+178367@code.qastaging.launchpad.net

Description of the change

big restructure..

dont merge now!!

To post a comment you must log in.

Unmerged revisions

112. By Eduardd Gotwig <email address hidden>

Fix markup issue

111. By Eduardd Gotwig <email address hidden>

more improvements

110. By Eduardd Gotwig <email address hidden>

some more improvement, we stil gotta have to add add the properties to service-states
------------- This line and the following will be ignored --------------

modified:
  lib/Service.vala
  src/Gazette.vala

109. By Eduardd Gotwig <email address hidden>

radical new approach; service-states is meant to hold ALL states of widgets, which are essential for everyone, independent of its function
like update-interval, fonts, color. only look is implemented yet. functions will soon follow. Show these essential values the user in the plug.
Todo: Add an expander, hide button for this, as this are "advanced settings"

108. By Eduardd Gotwig <email address hidden>

Change default font to Open Sans , instead of Open Sans Light, so the filter works correctly. We have weight problems, for now this is the only way to fix them. some fonts work (like Open Sans Light), others not (like Raleway Thin)

107. By Eduardd Gotwig <email address hidden>

improve font filter

106. By Eduardd Gotwig <email address hidden>

limit font selection

105. By Eduardd Gotwig <email address hidden>

Drop fontsize support in dconf: scaling should in/decrease font levels, and not the zoom factor; add font support for Weather plug

104. By Eduardd Gotwig <email address hidden>

Even better style

103. By Eduardd Gotwig <email address hidden>

Radical new plug interface

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: