Check-in [395935d038]
Overview
Comment: | Make channel tab positions configurable. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
395935d038c7172eb0bec2ec7d3d71a1 |
User & Date: | mario on 2014-08-15 00:46:28 |
Other Links: | manifest | tags |
Context
2014-08-15
| ||
00:58 | Reintroduced Live365 status display (gtk STOP sign for non-"PUBLIC" entries, or deleted strikethrough if server not "OK") check-in: 2bba5c0a5f user: mario tags: trunk | |
00:46 | Make channel tab positions configurable. check-in: 395935d038 user: mario tags: trunk | |
2014-08-12
| ||
18:45 | Allow use of custom Dirble API key. check-in: e5d39589b8 user: mario tags: trunk | |
Changes
Modified gtk2.xml from [692df17e3f] to [ea4f349c63].
1 2 | 1 2 3 4 5 6 7 8 9 10 | - + | <?xml version="1.0" encoding="UTF-8"?> <interface> |
︙ | |||
43 44 45 46 47 48 49 | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | - - - | <property name="can_focus">False</property> <child> <object class="GtkNotebook" id="config_notebook"> <property name="width_request">520</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="scrollable">True</property> |
︙ | |||
78 79 80 81 82 83 84 | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | - - | <property name="position">0</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow4"> <property name="visible">True</property> <property name="can_focus">True</property> |
︙ | |||
260 261 262 263 264 265 266 | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 | - - | <property name="tab_fill">False</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow3"> <property name="visible">True</property> <property name="can_focus">True</property> |
︙ | |||
459 460 461 462 463 464 465 | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 | - | <property name="visible">True</property> <property name="can_focus">True</property> <property name="max_length">5</property> <property name="invisible_char">●</property> <property name="width_chars">5</property> <property name="text" translatable="yes">500</property> <property name="shadow_type">out</property> |
︙ | |||
612 613 614 615 616 617 618 | 604 605 606 607 608 609 610 611 612 613 614 615 616 617 | - | <child> <object class="GtkEntry" id="config_tmp"> <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> |
︙ | |||
682 683 684 685 686 687 688 | 673 674 675 676 677 678 679 680 681 682 683 684 685 686 | - | <property name="width_request">200</property> <property name="height_request">20</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">False</property> <property name="invisible_char">●</property> <property name="width_chars">20</property> |
︙ | |||
800 801 802 803 804 805 806 | 790 791 792 793 794 795 796 797 798 799 800 801 802 803 | - | </packing> </child> <child> <object class="GtkEntry" id="config_channel_order"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> |
︙ | |||
1089 1090 1091 1092 1093 1094 1095 | 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <property name="type_hint">dialog</property> <property name="gravity">center</property> <property name="opacity">0.94999999999999996</property> <signal name="close" handler="search_cancel" swapped="no"/> <signal name="delete-event" handler="search_cancel" swapped="no"/> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> |
︙ | |||
1404 1405 1406 1407 1408 1409 1410 | 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 | - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - | <property name="can_focus">False</property> <property name="border_width">5</property> <property name="type_hint">normal</property> <signal name="close" handler="timer_cancel" swapped="no"/> <signal name="delete-event" handler="timer_cancel" swapped="no"/> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox2"> |
︙ | |||
2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 | 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | <signal name="activate" handler="menu_toolbar_size_large" swapped="no"/> </object> </child> </object> </child> </object> </child> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Channel tab position</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu" id="menu4"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Top</property> <property name="use_underline">True</property> <signal name="activate" handler="menu_notebook_pos_top" swapped="no"/> </object> </child> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Left</property> <property name="use_underline">True</property> <signal name="activate" handler="menu_notebook_pos_left" swapped="no"/> </object> </child> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Bottom</property> <property name="use_underline">True</property> <signal name="activate" handler="menu_notebook_pos_bottom" swapped="no"/> </object> </child> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Right</property> <property name="use_underline">True</property> <signal name="activate" handler="menu_notebook_pos_right" swapped="no"/> </object> </child> </object> </child> </object> </child> <child> <object class="GtkMenuItem" id="menuitem15savestates"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Save states</property> <property name="use_underline">True</property> <signal name="activate" handler="app_state" swapped="no"/> |
︙ |
Modified gtk3.xml from [d444cf7acc] to [d9e3231522].
︙ | |||
1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 | 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <object class="GtkEntry" id="timer_value"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> <property name="text" translatable="yes">Fri,Sat 20:00-21:00</property> <property name="primary_icon_activatable">False</property> <property name="secondary_icon_activatable">False</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> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> |
︙ | |||
2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 | 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | <signal name="activate" handler="menu_toolbar_size_large" swapped="no"/> </object> </child> </object> </child> </object> </child> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Channel tab position</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu" id="menu4"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Top</property> <property name="use_underline">True</property> <signal name="activate" handler="menu_notebook_pos_top" swapped="no"/> </object> </child> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Left</property> <property name="use_underline">True</property> <signal name="activate" handler="menu_notebook_pos_left" swapped="no"/> </object> </child> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Bottom</property> <property name="use_underline">True</property> <signal name="activate" handler="menu_notebook_pos_bottom" swapped="no"/> </object> </child> <child> <object class="GtkMenuItem" id="menu_entry_switch_channel_tabs4"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Right</property> <property name="use_underline">True</property> <signal name="activate" handler="menu_notebook_pos_right" swapped="no"/> </object> </child> </object> </child> </object> </child> <child> <object class="GtkMenuItem" id="menuitem15savestates"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Save states</property> <property name="use_underline">True</property> <signal name="activate" handler="app_state" swapped="no"/> |
︙ |
Modified mygtk.py from [e851df07e7] to [2d60af2beb].
︙ | |||
297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 | + + + | # gtk.Toolbar if t == gtk.Toolbar: r[wn]["icon_size"] = int(w.get_icon_size()) r[wn]["style"] = int(w.get_style()) # gtk.Notebook if t == gtk.Notebook: r[wn]["page"] = w.get_current_page() r[wn]["tab_pos"] = int(w.get_tab_pos()) #print(r) return r gtk_position_type_enum = [gtk.POS_LEFT, gtk.POS_RIGHT, gtk.POS_TOP, gtk.POS_BOTTOM] #-- restore window and widget properties # # requires only the previously saved widget state dict # @staticmethod |
︙ | |||
337 338 339 340 341 342 343 344 345 346 347 348 349 350 | 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 | + + | if method == "icon_size": w.set_icon_size(args) if method == "style": w.set_style(args) # gtk.Notebook if method == "page": w.set_current_page(args) if method == "tab_pos": w.set_tab_pos(r[wn]["tab_pos"]) pass #-- Save-As dialog # |
︙ |
Modified st2.py from [80f1b4d75a] to [7066e84c89].
1 2 3 4 5 6 7 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | - + - + | #!/usr/bin/env python # encoding: UTF-8 # api: python # type: application # title: streamtuner2 # description: Directory browser for internet radio / audio streams # depends: pygtk | pygi, threading, pyquery, kronos, requests |
︙ | |||
189 190 191 192 193 194 195 196 197 198 199 200 201 202 | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 | + + + + | # menu "menu_toolbar_standard": lambda w: (self.toolbar.unset_style(), self.toolbar.unset_icon_size()), "menu_toolbar_style_icons": lambda w: (self.toolbar.set_style(gtk.TOOLBAR_ICONS)), "menu_toolbar_style_both": lambda w: (self.toolbar.set_style(gtk.TOOLBAR_BOTH)), "menu_toolbar_size_small": lambda w: (self.toolbar.set_icon_size(gtk.ICON_SIZE_SMALL_TOOLBAR)), "menu_toolbar_size_medium": lambda w: (self.toolbar.set_icon_size(gtk.ICON_SIZE_DND)), "menu_toolbar_size_large": lambda w: (self.toolbar.set_icon_size(gtk.ICON_SIZE_DIALOG)), "menu_notebook_pos_top": lambda w: self.notebook_channels.set_tab_pos(2), "menu_notebook_pos_left": lambda w: self.notebook_channels.set_tab_pos(0), "menu_notebook_pos_right": lambda w: self.notebook_channels.set_tab_pos(1), "menu_notebook_pos_bottom": lambda w: self.notebook_channels.set_tab_pos(3), # win_config "menu_properties": config_dialog.open, "config_cancel": config_dialog.hide, "config_save": config_dialog.save, "config_play_list_edit_col0": lambda w,path,txt: (config_dialog.list_edit(self.config_play, path, 0, txt)), "config_play_list_edit_col1": lambda w,path,txt: (config_dialog.list_edit(self.config_play, path, 1, txt)), "config_record_list_edit_col0": lambda w,path,txt: (config_dialog.list_edit(self.config_record, path, 0, txt)), |
︙ | |||
230 231 232 233 234 235 236 | 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 | - - - - + - - - - + - + - - + - - + - - + - + - - + - - + + - - - + - - + - + - - + - - - + - - + - - + - - + - - + - - + - + - - + - + - - - + - - + - + - + + + + | }.items() ) + list( self.add_signals.items() ) )) # actually display main window gui_startup(98.9/100.0) self.win_streamtuner2.show() |
︙ |