Permalink
Browse files

Merge branch 'gtk3'

Conflicts:
	debian/changelog
	debian/control
	src/cloudsn/const.py
  • Loading branch information...
2 parents a2ed76d + bc9c7fc commit 90c2973c349961a901fc265722e22eb36b331da9 @chuchiperriman committed May 20, 2012
Showing with 1,164 additions and 728 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 cloudsn-local
  3. +30 −12 data/gmail-account.ui
  4. +58 −0 data/greader-account.ui
  5. +37 −14 data/imap-account.ui
  6. +597 −482 data/preferences.ui
  7. +8 −4 data/twitter-account.ui
  8. +19 −1 debian/changelog
  9. +18 −0 debian/cloudsnpackaging.txt
  10. +2 −2 debian/control
  11. +18 −0 doc/cloudsnpackaging.txt
  12. +1 −1 setup.py
  13. +8 −4 src/cloudsn/cloudsn.py
  14. +1 −1 src/cloudsn/const.py
  15. +7 −7 src/cloudsn/core/account.py
  16. +6 −7 src/cloudsn/core/config.py
  17. +22 −19 src/cloudsn/core/controller.py
  18. +4 −1 src/cloudsn/core/indicator.py
  19. +2 −0 src/cloudsn/core/keyring.py
  20. +1 −1 src/cloudsn/core/keyrings/base64keyring.py
  21. +20 −12 src/cloudsn/core/keyrings/gkeyring.py
  22. +1 −1 src/cloudsn/core/keyrings/plainkeyring.py
  23. +29 −27 src/cloudsn/core/notification.py
  24. +2 −0 src/cloudsn/core/sound.py
  25. +16 −15 src/cloudsn/core/utils.py
  26. +2 −2 src/cloudsn/providers/feedsprovider.py
  27. +3 −3 src/cloudsn/providers/gmailprovider.py
  28. +1 −1 src/cloudsn/providers/greaderprovider.py
  29. +5 −4 src/cloudsn/providers/identicaprovider.py
  30. +3 −3 src/cloudsn/providers/imapprovider.py
  31. +1 −1 src/cloudsn/providers/pop3provider.py
  32. +3 −3 src/cloudsn/providers/providersbase.py
  33. +2 −2 src/cloudsn/providers/twitterprovider.py
  34. +3 −3 src/cloudsn/ui/about.py
  35. +12 −12 src/cloudsn/ui/authwarning.py
  36. +5 −8 src/cloudsn/ui/indicators/indicatorapplet.py
  37. +24 −34 src/cloudsn/ui/indicators/statusicon.py
  38. +7 −7 src/cloudsn/ui/utils.py
  39. +35 −33 src/cloudsn/ui/window.py
  40. +79 −0 tests/greader.py
  41. +70 −0 tests/poptest.py
View
@@ -1 +1,2 @@
*.pyc
+*~
View
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
import os, sys
srcpath = os.path.abspath("src")
sys.path.insert(0,srcpath)
View
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy project-wide -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="labels_store">
<columns>
<!-- column-name label -->
@@ -10,26 +9,29 @@
</object>
<object class="GtkVBox" id="container">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<child>
<object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">&#x25CF;</property>
+ <property name="invisible_char"></property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -41,7 +43,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="visibility">False</property>
- <property name="invisible_char">&#x25CF;</property>
+ <property name="invisible_char"></property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -53,12 +55,14 @@
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Username: </property>
</object>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Password: </property>
</object>
<packing>
@@ -73,6 +77,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Account information&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -87,21 +92,22 @@
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="labels_treeview">
@@ -110,13 +116,16 @@
<property name="model">labels_store</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn" id="label_column">
<property name="title">Label</property>
<child>
<object class="GtkCellRendererText" id="label_cell">
<property name="editable">True</property>
- <signal name="edited" handler="label_cell_edited_cb"/>
+ <signal name="edited" handler="label_cell_edited_cb" swapped="no"/>
</object>
<attributes>
<attribute name="text">0</attribute>
@@ -128,21 +137,25 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkButton" id="add_label_button">
<property name="label">gtk-add</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="add_label_button_clicked_cb"/>
+ <signal name="clicked" handler="add_label_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -153,11 +166,13 @@
<child>
<object class="GtkButton" id="del_label_button">
<property name="label">gtk-delete</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="del_label_button_clicked_cb"/>
+ <signal name="clicked" handler="del_label_button_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -179,12 +194,15 @@
<child type="label">
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Labels to check&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
View
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkTable" id="container">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Set permissions on Google:</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="permission_button">
+ <property name="label" translatable="yes">Go to Google</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="relief">none</property>
+ <property name="uri">http://glade.gnome.org</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Set the Google PIN:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="pin_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ </object>
+</interface>
Oops, something went wrong.

0 comments on commit 90c2973

Please sign in to comment.