Commit graph

788 commits

Author SHA1 Message Date
Michael Käufl
299d5ed7f0 Renamed proxy
The naming now reflects, that the proxy is only being used for images.
2014-10-21 16:01:05 +02:00
Michael Käufl
f9d738c651 Moved processPendingRequests() to EOF 2014-10-21 15:25:45 +02:00
Michael Käufl
9a10b24549 Annotated private functions 2014-10-21 15:19:36 +02:00
Michael Käufl
1b29f359d6 Removed unreachable code 2014-10-21 14:50:56 +02:00
Michael Käufl
7a7fb0cb78 [Refactoring] Javascript: if-else 2014-10-21 14:50:18 +02:00
Michael Käufl
4e63767e4b [Refactoring] Javascript: whitepaces + indentation + if-else 2014-10-21 14:39:42 +02:00
Michael Käufl
5c5142f348 [sailfish] Fixed overlapping of Label with Bubble
The width was 3*Theme.paddingMedium (or 2*Theme.paddingMedium without
an icon) to big.  Correct calculation:

width: parent.width - anchors.margins
  - (icon.visible ? (icon.width + icon.anchors.margins) : 0)
  - bubble.width - bubble.anchors.margins
  - Theme.paddingMedium

Details:
• anchors.margins
  Padding to anchors.left of Label

• icon.anchors.margins
  Padding between Icon and ListItem

• bubble.anchors.margins
  Padding between Bubble and ListItem

• Theme.paddingMedium
  Padding between Label and Bubble

This commit simplifies the code.
2014-10-20 12:45:46 +02:00
Hauke Schade
a25adace9d Merge pull request #109 from michael-k/settings
Settings
2014-10-19 19:24:15 +02:00
Hauke Schade
9fb4199dac version bump 2014-10-19 19:12:43 +02:00
Hauke Schade
38b6bcfa4e [harmattan] proper conf path, closes #107 2014-10-19 14:54:14 +02:00
Hauke Schade
2b356bf4c3 [sailfish] closes #107 2014-10-18 22:13:14 +02:00
Hauke Schade
fd699938b5 version bump 2014-10-12 18:24:40 +02:00
Hauke Schade
bad3c4926e Merge pull request #105 from michael-k/0.4.4-fixups
0.4.4 fixups
2014-10-12 17:52:32 +02:00
Hauke Schade
481d56839d Merge pull request #104 from michael-k/bubble
[sailfish] Rewrite Bubble.qml
2014-10-12 17:52:29 +02:00
Michael Käufl
a4b6bf7af9 [sailfish] Rewrite Bubble.qml
Now all code is 'GPLv2 or later'
2014-10-10 01:03:02 +02:00
Michael Käufl
1ffe62afa2 [sailfish] Simplify 2014-10-10 00:14:45 +02:00
Michael Käufl
98b0570315 short is a reserved word in javascript
See http://www.w3schools.com/js/js_reserved.asp
2014-10-10 00:12:00 +02:00
Michael Käufl
2ce1a8c2dd [sailfish] Use SectionHeader instead of Label 2014-10-09 14:07:14 +02:00
Hauke Schade
7b0a51d7ff Fixed a spelling error in german translation, regards #100 2014-10-08 18:47:05 +02:00
Hauke Schade
f64f012eb8 Merge branch 'master' of github.com:cnlpete/ttrss 2014-10-08 18:44:33 +02:00
Hauke Schade
80e99eb2c8 Merge pull request #103 from michael-k/german
updated german translation, regards #100
2014-10-08 18:44:25 +02:00
Hauke Schade
bfd4ec9e17 updated russian translation, regards #100 2014-10-08 18:43:07 +02:00
Michael Käufl
c18f7cc67f [sailfish] Let the user define the length of title & excerpt
Closes #102 on sailfish
2014-10-08 00:14:00 +02:00
Michael Käufl
543be74420 Fixed return type 2014-10-08 00:13:07 +02:00
Michael Käufl
61b1c90c93 updated german translation, regards #100 2014-10-07 23:37:29 +02:00
Hauke Schade
fa6dbb07bd updated translations file 2014-10-07 22:35:55 +02:00
Michael Käufl
2d85eb606f [sailfish] Switched from ComboBoxList to ComboBox in Settings
Removed unused code from ComboBoxList, too.
2014-10-07 22:31:09 +02:00
Michael Käufl
fc8e61f213 Ordered settings.hh and settings.cpp 2014-10-07 22:31:09 +02:00
Michael Käufl
6bf0b2845b [sailfish] Reorganized Settings Dialog
- Grouping according to pages
- Unify naming (from the users' pov; the variable naming is still a
  bit chaotic)
2014-10-07 22:31:09 +02:00
Michael Käufl
ddd2c12d0c [sailfish] Renamed setting teaseContent to showExcerpt
Following the tt-rss naming.  Regards #101
2014-10-07 22:30:58 +02:00
Hauke Schade
253a555afa [sailfish] setting maxwidth for texts in covers allowing for them to be wordwrapped/faded 2014-10-07 22:30:00 +02:00
Hauke Schade
4b74f6c48a [sailfish] refactoring of CoverCode with an updateAction signal instead of handing over the model 2014-10-07 22:28:43 +02:00
Michael Käufl
60bf9af208 [sailfish] Made the content teaser optional
Closes #101 on sailfish
2014-10-07 22:28:29 +02:00
Hauke Schade
25769b3868 [harmattan] updated copyright date 2014-10-07 22:13:00 +02:00
Hauke Schade
1fd3c4494f [harmattan] added sailfish qml's as other files in harmattan project so one can have a look at how things are done 2014-10-07 21:58:43 +02:00
Hauke Schade
2564b2a3ec [harmattan] added romanian to harmattan project file 2014-10-07 21:58:08 +02:00
Hauke Schade
8a545a9622 [harmattan] added 'Display Labels in Item List'-Option similar to sailfish version, see c57ac0e463 2014-10-07 21:57:36 +02:00
Hauke Schade
5a64a8dd8b updated french translation, regards #100 2014-10-07 21:26:57 +02:00
Hauke Schade
9a545e5871 updated czech translation, regards #100 2014-10-07 21:26:51 +02:00
Hauke Schade
4adfe0ed3d updated spanish translation, regards #100 2014-10-06 20:50:50 +02:00
Hauke Schade
af61a9989f updated translation files 2014-10-06 20:31:40 +02:00
Hauke Schade
34fd07024e Merge pull request #98 from michael-k/remorse
[sailfish] Use RemorseItem/-Popup before unsubcribing or marking all read
2014-10-06 20:05:17 +02:00
Michael Käufl
8ee76dc3c1 [sailfish] Use RemorseItem/-Popup before unsubcribing or marking all read
Closes #97
2014-10-04 17:34:59 +02:00
Hauke Schade
83db051b82 Merge branch 'michael-k-stuff' 2014-10-03 20:45:46 +02:00
Hauke Schade
98e2beb815 updated master ts file 2014-10-03 20:45:20 +02:00
Hauke Schade
f17797a178 Merge branch 'stuff' of git://github.com/michael-k/ttrss into michael-k-stuff
Conflicts:
	qml/ttrss/sailfish/cover/CategoriesCover.qml
	qml/ttrss/sailfish/cover/FeedItemsCover.qml
	qml/ttrss/sailfish/cover/FeedsCover.qml
2014-10-03 20:04:15 +02:00
Hauke Schade
daa8d64b1f code cleanup 2014-10-03 19:48:41 +02:00
Hauke Schade
1d41628303 [sailfish] fix for label being null 2014-10-03 19:48:33 +02:00
Hauke Schade
6fdeae1a87 Merge branch 'labels' of git://github.com/michael-k/ttrss into michael-k-labels
Conflicts:
	i18n/harbour-ttrss-cnlpete.ts
2014-10-03 19:33:50 +02:00
Hauke Schade
a3a400061c - updated spanish translation 2014-10-02 19:42:43 +02:00