Check-in [ac8632bc29]
Comment: | Search dialog offers (x) all channels or (x) just current for server+cache scan
again. Removed search="" parameter from channels that don't implement it.
(To remove extraneous .has_search channel attribute again somewhen..)
External: Xiph IO cache ?search= should be changed to work on station titles instead of genres. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
ac8632bc299ef105f802ec5516c9792b |
User & Date: | mario on 2014-06-03 00:29:43 |
Other Links: | manifest | tags |
2014-06-16
| ||
15:06 | Keep last searched channel for search dialog (but avoid bookmarks) check-in: a7ee09dc9a user: mario tags: trunk | |
2014-06-03
| ||
00:29 |
Search dialog offers (x) all channels or (x) just current for server+cache scan
again. Removed search="" parameter from channels that don't implement it.
(To remove extraneous .has_search channel attribute again somewhen..)
External: Xiph IO cache ?search= should be changed to work on station titles instead of genres. check-in: ac8632bc29 user: mario tags: trunk | |
2014-06-02
| ||
01:43 | Add server-search, slim down search dialog. check-in: bd29eb4ee9 user: mario tags: trunk | |
Modified _package.epm from [15050fe7e1] to [81c1d8ed48].
︙ | ︙ | |||
86 87 88 89 90 91 92 93 94 95 96 97 98 99 | f 644 root root /usr/share/doc/streamtuner2/help/action_saving.page ./help/action_saving.page f 644 root root /usr/share/doc/streamtuner2/help/channel_bookmarks.page ./help/channel_bookmarks.page f 644 root root /usr/share/doc/streamtuner2/help/channel_internetradioorguk.page ./help/channel_internetradioorguk.page f 644 root root /usr/share/doc/streamtuner2/help/channel_jamendo.page ./help/channel_jamendo.page f 644 root root /usr/share/doc/streamtuner2/help/channel_myoggradio.page ./help/channel_myoggradio.page f 644 root root /usr/share/doc/streamtuner2/help/channel_shoutcast.page ./help/channel_shoutcast.page f 644 root root /usr/share/doc/streamtuner2/help/channel_xiph.page ./help/channel_xiph.page f 644 root root /usr/share/doc/streamtuner2/help/channels.page ./help/channels.page f 644 root root /usr/share/doc/streamtuner2/help/cli.page ./help/cli.page f 644 root root /usr/share/doc/streamtuner2/help/config_apps.page ./help/config_apps.page f 644 root root /usr/share/doc/streamtuner2/help/configuration.page ./help/configuration.page f 644 root root /usr/share/doc/streamtuner2/help/extending.page ./help/extending.page f 644 root root /usr/share/doc/streamtuner2/help/global_key.page ./help/global_key.page f 644 root root /usr/share/doc/streamtuner2/help/glossary.page ./help/glossary.page | > > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | f 644 root root /usr/share/doc/streamtuner2/help/action_saving.page ./help/action_saving.page f 644 root root /usr/share/doc/streamtuner2/help/channel_bookmarks.page ./help/channel_bookmarks.page f 644 root root /usr/share/doc/streamtuner2/help/channel_internetradioorguk.page ./help/channel_internetradioorguk.page f 644 root root /usr/share/doc/streamtuner2/help/channel_jamendo.page ./help/channel_jamendo.page f 644 root root /usr/share/doc/streamtuner2/help/channel_myoggradio.page ./help/channel_myoggradio.page f 644 root root /usr/share/doc/streamtuner2/help/channel_shoutcast.page ./help/channel_shoutcast.page f 644 root root /usr/share/doc/streamtuner2/help/channel_xiph.page ./help/channel_xiph.page f 644 root root /usr/share/doc/streamtuner2/help/channel_youtube.page ./help/channel_youtube.page f 644 root root /usr/share/doc/streamtuner2/help/channel_surfmusik.page ./help/channel_surfmusik.page f 644 root root /usr/share/doc/streamtuner2/help/channels.page ./help/channels.page f 644 root root /usr/share/doc/streamtuner2/help/cli.page ./help/cli.page f 644 root root /usr/share/doc/streamtuner2/help/config_apps.page ./help/config_apps.page f 644 root root /usr/share/doc/streamtuner2/help/configuration.page ./help/configuration.page f 644 root root /usr/share/doc/streamtuner2/help/extending.page ./help/extending.page f 644 root root /usr/share/doc/streamtuner2/help/global_key.page ./help/global_key.page f 644 root root /usr/share/doc/streamtuner2/help/glossary.page ./help/glossary.page |
︙ | ︙ |
Modified channels/itunes.py from [a84557177e] to [e8f81d7822].
︙ | ︙ | |||
76 77 78 79 80 81 82 | # static list for iTunes def update_categories(self): pass # Just copy over stream URLs and station titles | | | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | # static list for iTunes def update_categories(self): pass # Just copy over stream URLs and station titles def update_streams(self, cat): m3u = http.get(self.base, {"category": cat.lower()}) if len(m3u) < 256: __print__(dbg.ERR, m3u) rx_m3u = re.compile(r""" ^File(\d+)\s*=\s*(http://[^\s]+)\s*$\s* |
︙ | ︙ |
Modified channels/live365.py from [ee023b1309] to [739df4ccb0].
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | # desc module = "live365" title = "Live365" homepage = "http://www.live365.com/" base_url = "http://www.live365.com/" listformat = "url/http" mediatype = "audio/mpeg" # content categories = ['Alternative', ['Britpop', 'Classic Alternative', 'College', 'Dancepunk', 'Dream Pop', 'Emo', 'Goth', 'Grunge', 'Indie Pop', 'Indie Rock', 'Industrial', 'Lo-Fi', 'Modern Rock', 'New Wave', 'Noise Pop', 'Post-Punk', 'Power Pop', 'Punk'], 'Blues', ['Acoustic Blues', 'Chicago Blues', 'Contemporary Blues', 'Country Blues', 'Delta Blues', 'Electric Blues', 'Cajun/Zydeco'], 'Classical', ['Baroque', 'Chamber', 'Choral', 'Classical Period', 'Early Classical', 'Impressionist', 'Modern', 'Opera', 'Piano', 'Romantic', 'Symphony'], 'Country', ['Alt-Country', 'Americana', 'Bluegrass', 'Classic Country', 'Contemporary Bluegrass', 'Contemporary Country', 'Honky Tonk', 'Hot Country Hits', 'Western'], 'Easy Listening', ['Exotica', 'Lounge', 'Orchestral Pop', 'Polka', 'Space Age Pop'], 'Electronic/Dance', ['Acid House', 'Ambient', 'Big Beat', 'Breakbeat', 'Disco', 'Downtempo', "Drum 'n' Bass", 'Electro', 'Garage', 'Hard House', 'House', 'IDM', 'Jungle', 'Progressive', 'Techno', 'Trance', 'Tribal', 'Trip Hop'], 'Folk', ['Alternative Folk', 'Contemporary Folk', 'Folk Rock', 'New Acoustic', 'Traditional Folk', 'World Folk'], 'Freeform', ['Chill', 'Experimental', 'Heartache', 'Love/Romance', 'Music To ... To', 'Party Mix', 'Patriotic', 'Rainy Day Mix', 'Reality', 'Shuffle/Random', 'Travel Mix', 'Trippy', 'Various', 'Women', 'Work Mix'], 'Hip-Hop/Rap', ['Alternative Rap', 'Dirty South', 'East Coast Rap', 'Freestyle', 'Gangsta Rap', 'Old School', 'Turntablism', 'Underground Hip-Hop', 'West Coast Rap'], 'Inspirational', ['Christian', 'Christian Metal', 'Christian Rap', 'Christian Rock', 'Classic Christian', 'Contemporary Gospel', 'Gospel', 'Praise/Worship', 'Sermons/Services', 'Southern Gospel', 'Traditional Gospel'], 'International', ['African', 'Arabic', 'Asian', 'Brazilian', 'Caribbean', 'Celtic', 'European', 'Filipino', 'Greek', 'Hawaiian/Pacific', 'Hindi', 'Indian', 'Japanese', 'Jewish', 'Mediterranean', 'Middle Eastern', 'North American', 'Soca', 'South American', 'Tamil', 'Worldbeat', 'Zouk'], 'Jazz', ['Acid Jazz', 'Avant Garde', 'Big Band', 'Bop', 'Classic Jazz', 'Cool Jazz', 'Fusion', 'Hard Bop', 'Latin Jazz', 'Smooth Jazz', 'Swing', 'Vocal Jazz', 'World Fusion'], 'Latin', ['Bachata', 'Banda', 'Bossa Nova', 'Cumbia', 'Latin Dance', 'Latin Pop', 'Latin Rap/Hip-Hop', 'Latin Rock', 'Mariachi', 'Merengue', 'Ranchera', 'Salsa', 'Tango', 'Tejano', 'Tropicalia'], 'Metal', ['Extreme Metal', 'Heavy Metal', 'Industrial Metal', 'Pop Metal/Hair', 'Rap Metal'], 'New Age', ['Environmental', 'Ethnic Fusion', 'Healing', 'Meditation', 'Spiritual'], 'Oldies', ['30s', '40s', '50s', '60s', '70s', '80s', '90s'], 'Pop', ['Adult Contemporary', 'Barbershop', 'Bubblegum Pop', 'Dance Pop', 'JPOP', 'Soft Rock', 'Teen Pop', 'Top 40', 'World Pop'], 'R&B/Urban', ['Classic R&B', 'Contemporary R&B', 'Doo Wop', 'Funk', 'Motown', 'Neo-Soul', 'Quiet Storm', 'Soul', 'Urban Contemporary'], 'Reggae', ['Contemporary Reggae', 'Dancehall', 'Dub', 'Pop-Reggae', 'Ragga', 'Reggaeton', 'Rock Steady', 'Roots Reggae', 'Ska'], 'Rock', ['Adult Album Alternative', 'British Invasion', 'Classic Rock', 'Garage Rock', 'Glam', 'Hard Rock', 'Jam Bands', 'Prog/Art Rock', 'Psychedelic', 'Rock & Roll', 'Rockabilly', 'Singer/Songwriter', 'Surf'], 'Seasonal/Holiday', ['Anniversary', 'Birthday', 'Christmas', 'Halloween', 'Hanukkah', 'Honeymoon', 'Valentine', 'Wedding'], 'Soundtracks', ['Anime', "Children's/Family", 'Original Score', 'Showtunes'], 'Talk', ['Comedy', 'Community', 'Educational', 'Government', 'News', 'Old Time Radio', 'Other Talk', 'Political', 'Scanner', 'Spoken Word', 'Sports']] current = "" default = "Pop" | > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | # desc module = "live365" title = "Live365" homepage = "http://www.live365.com/" base_url = "http://www.live365.com/" has_search = True listformat = "url/http" mediatype = "audio/mpeg" # content categories = ['Alternative', ['Britpop', 'Classic Alternative', 'College', 'Dancepunk', 'Dream Pop', 'Emo', 'Goth', 'Grunge', 'Indie Pop', 'Indie Rock', 'Industrial', 'Lo-Fi', 'Modern Rock', 'New Wave', 'Noise Pop', 'Post-Punk', 'Power Pop', 'Punk'], 'Blues', ['Acoustic Blues', 'Chicago Blues', 'Contemporary Blues', 'Country Blues', 'Delta Blues', 'Electric Blues', 'Cajun/Zydeco'], 'Classical', ['Baroque', 'Chamber', 'Choral', 'Classical Period', 'Early Classical', 'Impressionist', 'Modern', 'Opera', 'Piano', 'Romantic', 'Symphony'], 'Country', ['Alt-Country', 'Americana', 'Bluegrass', 'Classic Country', 'Contemporary Bluegrass', 'Contemporary Country', 'Honky Tonk', 'Hot Country Hits', 'Western'], 'Easy Listening', ['Exotica', 'Lounge', 'Orchestral Pop', 'Polka', 'Space Age Pop'], 'Electronic/Dance', ['Acid House', 'Ambient', 'Big Beat', 'Breakbeat', 'Disco', 'Downtempo', "Drum 'n' Bass", 'Electro', 'Garage', 'Hard House', 'House', 'IDM', 'Jungle', 'Progressive', 'Techno', 'Trance', 'Tribal', 'Trip Hop'], 'Folk', ['Alternative Folk', 'Contemporary Folk', 'Folk Rock', 'New Acoustic', 'Traditional Folk', 'World Folk'], 'Freeform', ['Chill', 'Experimental', 'Heartache', 'Love/Romance', 'Music To ... To', 'Party Mix', 'Patriotic', 'Rainy Day Mix', 'Reality', 'Shuffle/Random', 'Travel Mix', 'Trippy', 'Various', 'Women', 'Work Mix'], 'Hip-Hop/Rap', ['Alternative Rap', 'Dirty South', 'East Coast Rap', 'Freestyle', 'Gangsta Rap', 'Old School', 'Turntablism', 'Underground Hip-Hop', 'West Coast Rap'], 'Inspirational', ['Christian', 'Christian Metal', 'Christian Rap', 'Christian Rock', 'Classic Christian', 'Contemporary Gospel', 'Gospel', 'Praise/Worship', 'Sermons/Services', 'Southern Gospel', 'Traditional Gospel'], 'International', ['African', 'Arabic', 'Asian', 'Brazilian', 'Caribbean', 'Celtic', 'European', 'Filipino', 'Greek', 'Hawaiian/Pacific', 'Hindi', 'Indian', 'Japanese', 'Jewish', 'Mediterranean', 'Middle Eastern', 'North American', 'Soca', 'South American', 'Tamil', 'Worldbeat', 'Zouk'], 'Jazz', ['Acid Jazz', 'Avant Garde', 'Big Band', 'Bop', 'Classic Jazz', 'Cool Jazz', 'Fusion', 'Hard Bop', 'Latin Jazz', 'Smooth Jazz', 'Swing', 'Vocal Jazz', 'World Fusion'], 'Latin', ['Bachata', 'Banda', 'Bossa Nova', 'Cumbia', 'Latin Dance', 'Latin Pop', 'Latin Rap/Hip-Hop', 'Latin Rock', 'Mariachi', 'Merengue', 'Ranchera', 'Salsa', 'Tango', 'Tejano', 'Tropicalia'], 'Metal', ['Extreme Metal', 'Heavy Metal', 'Industrial Metal', 'Pop Metal/Hair', 'Rap Metal'], 'New Age', ['Environmental', 'Ethnic Fusion', 'Healing', 'Meditation', 'Spiritual'], 'Oldies', ['30s', '40s', '50s', '60s', '70s', '80s', '90s'], 'Pop', ['Adult Contemporary', 'Barbershop', 'Bubblegum Pop', 'Dance Pop', 'JPOP', 'Soft Rock', 'Teen Pop', 'Top 40', 'World Pop'], 'R&B/Urban', ['Classic R&B', 'Contemporary R&B', 'Doo Wop', 'Funk', 'Motown', 'Neo-Soul', 'Quiet Storm', 'Soul', 'Urban Contemporary'], 'Reggae', ['Contemporary Reggae', 'Dancehall', 'Dub', 'Pop-Reggae', 'Ragga', 'Reggaeton', 'Rock Steady', 'Roots Reggae', 'Ska'], 'Rock', ['Adult Album Alternative', 'British Invasion', 'Classic Rock', 'Garage Rock', 'Glam', 'Hard Rock', 'Jam Bands', 'Prog/Art Rock', 'Psychedelic', 'Rock & Roll', 'Rockabilly', 'Singer/Songwriter', 'Surf'], 'Seasonal/Holiday', ['Anniversary', 'Birthday', 'Christmas', 'Halloween', 'Hanukkah', 'Honeymoon', 'Valentine', 'Wedding'], 'Soundtracks', ['Anime', "Children's/Family", 'Original Score', 'Showtunes'], 'Talk', ['Comedy', 'Community', 'Educational', 'Government', 'News', 'Old Time Radio', 'Other Talk', 'Political', 'Scanner', 'Spoken Word', 'Sports']] current = "" default = "Pop" |
︙ | ︙ | |||
93 94 95 96 97 98 99 | # don't forget last entries self.categories.append(last) # extract stream infos | | | | | > | | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | # don't forget last entries self.categories.append(last) # extract stream infos def update_streams(self, cat, search=None): # search if search: url = "http://www.live365.com/cgi-bin/directory.cgi?site=..&searchdesc=" + urllib.quote(search) + "&searchgenre=" + self.cat2tag(cat) + "&x=0&y=0" # genre else: url = "http://www.live365.com/cgi-bin/directory.cgi?first=1&rows=200&mode=2&genre=" + self.cat2tag(cat) html = http.get(url, feedback=self.parent.status) # we only need to download one page, because live365 always only gives 200 results # terse format rx = re.compile(r""" ['"](OK|PM_ONLY|SUBSCRIPTION).*? href=['"](http://www.live365.com/stations/\w+)['"].*? |
︙ | ︙ |
Modified channels/musicgoal.py from [3d5f5c99cc] to [9694d3b314].
︙ | ︙ | |||
54 55 56 57 58 59 60 | # nop def update_categories(self): pass # request json API | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | # nop def update_categories(self): pass # request json API def update_streams(self, cat): # category type: podcast or radio if cat in self.podcast: grp = "podcast" url = self.api_podcast % (grp, self.podcast.index(cat)+1) elif cat in self.radio: grp = "radio" |
︙ | ︙ |
Modified channels/shoutcast.py from [df39e04b9d] to [e44717b0a9].
︙ | ︙ | |||
85 86 87 88 89 90 91 | # it's done #__print__( dbg.PROC, self.categories ) conf.save("cache/categories_shoutcast", self.categories) pass # downloads stream list from shoutcast for given category | | | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | # it's done #__print__( dbg.PROC, self.categories ) conf.save("cache/categories_shoutcast", self.categories) pass # downloads stream list from shoutcast for given category def update_streams(self, cat): if (not cat or cat == self.empty): __print__( dbg.ERR, "nocat" ) return [] #/radiolist.cfm?action=sub&string=&cat=Oldies&_cf_containerId=radiolist&_cf_nodebug=true&_cf_nocache=true&_cf_rc=0 #/radiolist.cfm?start=19&action=sub&string=&cat=Oldies&amount=18&order=listeners |
︙ | ︙ |
Modified channels/xiph.py from [97b65b9a1c] to [1d8ab2c715].
︙ | ︙ | |||
82 83 84 85 86 87 88 | # just counts genre tokens, does not automatically create a category tree from it def update_categories(self): pass # downloads stream list from xiph.org for given category | | | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | # just counts genre tokens, does not automatically create a category tree from it def update_categories(self): pass # downloads stream list from xiph.org for given category def update_streams(self, cat, search=None): # With the new JSON cache API on I-O, we can load categories individually: params = {} if cat: params["cat"] = cat.lower() if search: params["search"] = search |
︙ | ︙ |
Modified channels/youtube.py from [cd9934e99a] to [f52ff49900].
1 2 3 4 5 | # encoding: UTF-8 # api: streamtuner2 # title: Youtube # description: Channel, playlist and video browsing for youtube. # type: channel | | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | # encoding: UTF-8 # api: streamtuner2 # title: Youtube # description: Channel, playlist and video browsing for youtube. # type: channel # version: 0.2 # category: video # priority: optional # suggests: youtube-dl # # # Lists recently popular youtube videos by category or channels. # # Introduces the faux MIME type "video/youtube" for player and recording # configuration; both utilizing `youtube-dl`. But VLC can consume Youtube # URLs directly anyhow. |
︙ | ︙ | |||
182 183 184 185 186 187 188 | entries = [] channels = self.categories[self.categories.index("my channels") + 1] # plain search request for videos if search is not None: for row in self.api("search", type="video", regionCode=conf.youtube_region, q=search): | | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | entries = [] channels = self.categories[self.categories.index("my channels") + 1] # plain search request for videos if search is not None: for row in self.api("search", type="video", regionCode=conf.youtube_region, q=search): entries.append( self.wrap3(row, {"genre": ""}) ) # Most Popular elif cat == "mostPopular": #for row in self.api("feeds/api/standardfeeds/%s/most_popular"%conf.youtube_region, ver=2): # entries.append(self.wrap2(row)) for row in self.api("videos", chart="mostPopular", regionCode=conf.youtube_region): entries.append( self.wrap3(row, {"genre": "mostPopular"}) ) |
︙ | ︙ |
Modified gtk2.xml from [a3cab018cd] to [692df17e3f].
︙ | ︙ | |||
1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 | </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="stock">gtk-add</property> </object> <object class="GtkDialog" id="search_dialog"> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">station search</property> <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> | > > < | | 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 | </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="stock">gtk-add</property> </object> <object class="GtkDialog" id="search_dialog"> <property name="width_request">325</property> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">station search</property> <property name="window_position">center-on-parent</property> <property name="destroy_with_parent">True</property> <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"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> |
︙ | ︙ | |||
1145 1146 1147 1148 1149 1150 1151 | <placeholder/> </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> | | > | 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 | <placeholder/> </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label1sd"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="ypad">10</property> <property name="label" translatable="yes">for</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> |
︙ | ︙ | |||
1177 1178 1179 1180 1181 1182 1183 | <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> | | > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < | > > > > | 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 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 | <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label4sd"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label3sd"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xpad">10</property> <property name="ypad">10</property> <property name="label" translatable="yes">in</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkRadioButton" id="search_dialog_all"> <property name="label" translatable="yes">all channels</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">search_dialog_current</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkRadioButton" id="search_dialog_current"> <property name="label" translatable="yes">just current</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">search_dialog_all</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <placeholder/> </child> <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">20</property> <child> <object class="GtkButton" id="cache_search"> <property name="label" translatable="yes">Cache _find</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Start searching for above search term in the currently loaded station lists. Doesn't find *new* information, just looks through the known data.</property> <property name="image">image1</property> <property name="relief">half</property> <property name="use_underline">True</property> <accelerator key="Return" signal="activate"/> <signal name="clicked" handler="search_go" swapped="no"/> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="server_search"> <property name="label" translatable="yes">Server _search</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_focus">True</property> <property name="is_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Instead of doing a cache search, go through the search functions on the directory service homepages. (UNIMPLEMENTED)</property> <property name="image">image2</property> <property name="use_underline">True</property> <signal name="clicked" handler="search_srv" swapped="no"/> </object> <packing> |
︙ | ︙ | |||
1342 1343 1344 1345 1346 1347 1348 | </object> </child> </object> <object class="GtkDialog" id="timer_dialog"> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="type_hint">normal</property> | > | | 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 | </object> </child> </object> <object class="GtkDialog" id="timer_dialog"> <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"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkHButtonBox" id="dialog-action_area2"> |
︙ | ︙ | |||
1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 | </child> <child> <object class="GtkTable" id="table2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 | </child> <child> <object class="GtkTable" id="table2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <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> <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> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> |
︙ | ︙ | |||
1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> | > > > > > > > > > > > > > > > | 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> |
︙ | ︙ | |||
1903 1904 1905 1906 1907 1908 1909 1910 | </child> </object> <object class="GtkWindow" id="win_streamedit"> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">inspect/edit stream data</property> <property name="window_position">center-on-parent</property> <property name="skip_pager_hint">True</property> | > < | 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 | </child> </object> <object class="GtkWindow" id="win_streamedit"> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="title" translatable="yes">inspect/edit stream data</property> <property name="window_position">center-on-parent</property> <property name="destroy_with_parent">True</property> <property name="skip_pager_hint">True</property> <property name="opacity">0.94999999999999996</property> <signal name="delete-event" handler="streamedit_cancel" swapped="no"/> <child> <object class="GtkTable" id="table6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">15</property> |
︙ | ︙ | |||
2286 2287 2288 2289 2290 2291 2292 | <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="menu_bookmark"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">bookmark</property> <property name="use_underline">True</property> | < > < > | | | 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 | <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="menu_bookmark"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">bookmark</property> <property name="use_underline">True</property> <accelerator key="F8" signal="activate"/> <accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/> <signal name="activate" handler="bookmark" swapped="no"/> </object> </child> <child> <object class="GtkImageMenuItem" id="imagemenuitem_saveas"> <property name="label">gtk-save-as</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/> <accelerator key="F2" signal="activate"/> <signal name="activate" handler="save_as" swapped="no"/> </object> </child> <child> <object class="GtkImageMenuItem" id="gtk-edit"> <property name="label">gtk-edit</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <accelerator key="Return" signal="activate" modifiers="GDK_MOD1_MASK"/> <accelerator key="space" signal="activate" modifiers="GDK_MOD1_MASK"/> <accelerator key="F3" signal="activate"/> <signal name="activate" handler="streamedit_open" swapped="no"/> </object> </child> <child> <object class="GtkMenuItem" id="extensions0"> <property name="visible">True</property> <property name="can_focus">False</property> |
︙ | ︙ | |||
2385 2386 2387 2388 2389 2390 2391 | <child> <object class="GtkImageMenuItem" id="menuitem_delete"> <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> | < > | 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 | <child> <object class="GtkImageMenuItem" id="menuitem_delete"> <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <accelerator key="x" signal="activate" modifiers="GDK_CONTROL_MASK"/> <accelerator key="Delete" signal="activate"/> <signal name="activate" handler="delete_entry" swapped="no"/> </object> </child> <child> <object class="GtkImageMenuItem" id="imagemenuitem8"> <property name="label">gtk-find</property> <property name="visible">True</property> |
︙ | ︙ |
Modified gtk3.xml from [e0966116c5] to [d444cf7acc].
︙ | ︙ | |||
1065 1066 1067 1068 1069 1070 1071 1072 | </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="stock">gtk-add</property> </object> <object class="GtkDialog" id="search_dialog"> <property name="can_focus">False</property> | > | > < | 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 | </object> <object class="GtkImage" id="image2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="stock">gtk-add</property> </object> <object class="GtkDialog" id="search_dialog"> <property name="width_request">325</property> <property name="can_focus">False</property> <property name="opacity">0.94999999999999996</property> <property name="border_width">5</property> <property name="title" translatable="yes">station search</property> <property name="window_position">center-on-parent</property> <property name="destroy_with_parent">True</property> <property name="type_hint">dialog</property> <property name="gravity">center</property> <signal name="close" handler="search_cancel" swapped="no"/> <signal name="delete-event" handler="search_cancel" swapped="no"/> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> |
︙ | ︙ | |||
1134 1135 1136 1137 1138 1139 1140 | <placeholder/> </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> | | > | 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 | <placeholder/> </child> <child> <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label1sd"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="ypad">10</property> <property name="label" translatable="yes">for</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> |
︙ | ︙ | |||
1164 1165 1166 1167 1168 1169 1170 | <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> | | > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < < | > > > > | 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 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 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 | <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label4sd"> <property name="visible">True</property> <property name="can_focus">False</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> <object class="GtkLabel" id="label3sd"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xpad">10</property> <property name="ypad">10</property> <property name="label" translatable="yes">in</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkRadioButton" id="search_dialog_all"> <property name="label" translatable="yes">all channels</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">search_dialog_current</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkRadioButton" id="search_dialog_current"> <property name="label" translatable="yes">just current</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> <property name="group">search_dialog_all</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">3</property> </packing> </child> <child> <placeholder/> </child> <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">20</property> <child> <object class="GtkButton" id="cache_search"> <property name="label" translatable="yes">Cache _find</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="receives_default">False</property> <property name="tooltip_text" translatable="yes">Start searching for above search term in the currently loaded station lists. Doesn't find *new* information, just looks through the known data.</property> <property name="image">image1</property> <property name="relief">half</property> <property name="use_underline">True</property> <signal name="clicked" handler="search_go" swapped="no"/> <accelerator key="Return" signal="activate"/> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkButton" id="server_search"> <property name="label" translatable="yes">Server _search</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="has_focus">True</property> <property name="is_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> <property name="tooltip_text" translatable="yes">Instead of doing a cache search, go through the search functions on the directory service homepages. (UNIMPLEMENTED)</property> <property name="image">image2</property> <property name="use_underline">True</property> <signal name="clicked" handler="search_srv" swapped="no"/> </object> <packing> |
︙ | ︙ | |||
1329 1330 1331 1332 1333 1334 1335 | </object> </child> </object> <object class="GtkDialog" id="timer_dialog"> <property name="can_focus">False</property> <property name="border_width">5</property> <property name="type_hint">normal</property> | > | | 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 | </object> </child> </object> <object class="GtkDialog" id="timer_dialog"> <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="GtkBox" id="dialog-vbox2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area2"> |
︙ | ︙ | |||
1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 | </child> <child> <object class="GtkTable" id="table2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 | </child> <child> <object class="GtkTable" id="table2"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="n_rows">3</property> <property name="n_columns">3</property> <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> <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> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> |
︙ | ︙ | |||
1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> | > > > > > > > > > > > > > > > | 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 | </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> <child> <placeholder/> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> <property name="position">1</property> </packing> </child> |
︙ | ︙ | |||
1910 1911 1912 1913 1914 1915 1916 1917 | </object> <object class="GtkWindow" id="win_streamedit"> <property name="can_focus">False</property> <property name="opacity">0.94999999999999996</property> <property name="border_width">5</property> <property name="title" translatable="yes">inspect/edit stream data</property> <property name="window_position">center-on-parent</property> <property name="skip_pager_hint">True</property> | > < | 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 | </object> <object class="GtkWindow" id="win_streamedit"> <property name="can_focus">False</property> <property name="opacity">0.94999999999999996</property> <property name="border_width">5</property> <property name="title" translatable="yes">inspect/edit stream data</property> <property name="window_position">center-on-parent</property> <property name="destroy_with_parent">True</property> <property name="skip_pager_hint">True</property> <signal name="delete-event" handler="streamedit_cancel" swapped="no"/> <child> <object class="GtkTable" id="table6"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">15</property> <property name="n_rows">10</property> |
︙ | ︙ | |||
2272 2273 2274 2275 2276 2277 2278 | <child> <object class="GtkMenuItem" id="menu_bookmark"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">bookmark</property> <property name="use_underline">True</property> <signal name="activate" handler="bookmark" swapped="no"/> | < > < > | | | 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 | <child> <object class="GtkMenuItem" id="menu_bookmark"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">bookmark</property> <property name="use_underline">True</property> <signal name="activate" handler="bookmark" swapped="no"/> <accelerator key="d" signal="activate" modifiers="GDK_CONTROL_MASK"/> <accelerator key="F8" signal="activate"/> </object> </child> <child> <object class="GtkImageMenuItem" id="imagemenuitem_saveas"> <property name="label">gtk-save-as</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="save_as" swapped="no"/> <accelerator key="F2" signal="activate"/> <accelerator key="s" signal="activate" modifiers="GDK_CONTROL_MASK"/> </object> </child> <child> <object class="GtkImageMenuItem" id="gtk-edit"> <property name="label">gtk-edit</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="streamedit_open" swapped="no"/> <accelerator key="F3" signal="activate"/> <accelerator key="space" signal="activate" modifiers="GDK_MOD1_MASK"/> <accelerator key="Return" signal="activate" modifiers="GDK_MOD1_MASK"/> </object> </child> <child> <object class="GtkMenuItem" id="extensions0"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Extensions</property> |
︙ | ︙ | |||
2371 2372 2373 2374 2375 2376 2377 | <object class="GtkImageMenuItem" id="menuitem_delete"> <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="delete_entry" swapped="no"/> | < > | 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 | <object class="GtkImageMenuItem" id="menuitem_delete"> <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <signal name="activate" handler="delete_entry" swapped="no"/> <accelerator key="Delete" signal="activate"/> <accelerator key="x" signal="activate" modifiers="GDK_CONTROL_MASK"/> </object> </child> <child> <object class="GtkImageMenuItem" id="imagemenuitem8"> <property name="label">gtk-find</property> <property name="visible">True</property> <property name="can_focus">False</property> |
︙ | ︙ |
Modified help/search.page from [5645afb77b] to [9659433a40].
︙ | ︙ | |||
21 22 23 24 25 26 27 | </section> <section id="cachesearch"> <title>Search window</title> <p>You can get to the search dialog via <guiseq><gui>Edit</gui> <gui>Find</gui></guiseq> or <key>Ctrl</key>+<key>F</key>. Centrally to this dialog is the text field, where you can specify the phrase to scan for.</p> | | | | < < | | | | > > | > | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | </section> <section id="cachesearch"> <title>Search window</title> <p>You can get to the search dialog via <guiseq><gui>Edit</gui> <gui>Find</gui></guiseq> or <key>Ctrl</key>+<key>F</key>. Centrally to this dialog is the text field, where you can specify the phrase to scan for.</p> <!--p>Above you can check which channel plugins to inspect for the search term. Using this allows to limit the search to specific radio station directories, but usually you want to search them all.</p> <p>Below the search phrase text box, you can specifiy which station fields to look into. Often you just want to search the titles of radio stations. But you can also have the search occour in the description/playing fields. Alternatively you could just search the homepage links.</p--> <p>And then there are two search methods. You mostly want to use the live <gui>Server search</gui>. It passes your search terms to the actual directory services, and loads the most recent data into a result list (this might take a few seconds). It's not implemented for all channel plugins however.</p> <p>With <gui>Cache find</gui> would just look up entries in your already downloaded channel/genre lists. Since often you are just looking for something you had already seen, this will give you the desired results.</p> </section> </page> |
Modified st2.py from [f68e153942] to [31aa4c2365].
︙ | ︙ | |||
583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 | # and also: quick search textbox (uses main.q instead) class search (auxiliary_window): # show search dialog def menu_search(self, w): self.search_dialog.show(); # hide dialog box again def cancel(self, *args): self.search_dialog.hide() return True # stop any other gtk handlers # prepare variables def prepare_search(self): main.status("Searching... Stand back.") self.cancel() self.q = self.search_full.get_text().lower() main.bookmarks.streams["search"] = [] # perform search def cache_search(self, *w): self.prepare_search() entries = [] # which fields? fields = ["title", "playing", "homepage"] | > > > > > < < < < < < | | | | | | < | | > | 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 | # and also: quick search textbox (uses main.q instead) class search (auxiliary_window): # show search dialog def menu_search(self, w): self.search_dialog.show(); self.search_dialog_current.set_label("just %s" % main.current_channel) # hide dialog box again def cancel(self, *args): self.search_dialog.hide() return True # stop any other gtk handlers # prepare variables def prepare_search(self): main.status("Searching... Stand back.") self.cancel() self.q = self.search_full.get_text().lower() if self.search_dialog_all.get_active(): self.targets = main.channels.keys() else: self.targets = [main.current_channel] main.bookmarks.streams["search"] = [] # perform search def cache_search(self, *w): self.prepare_search() entries = [] # which fields? fields = ["title", "playing", "homepage"] for i,cn in enumerate([main.channels[c] for c in self.targets]): if cn.streams: # skip disabled plugins # categories for cat in cn.streams.keys(): # stations for row in cn.streams[cat]: # assemble text fields to compare text = " ".join([row.get(f, " ") for f in fields]) if text.lower().find(self.q) >= 0: row["genre"] = c + " " + row.get("genre", "") entries.append(row) self.show_results(entries) # display "search" in "bookmarks" def show_results(self, entries): main.status(1.0) main.channel_switch(None, "bookmarks", 0) main.bookmarks.set_category("search") # insert data and show main.channels["bookmarks"].streams["search"] = entries # we have to set it here, else .currentcat() might reset it main.bookmarks.load("search") # live search on directory server homepages def server_search(self, w): self.prepare_search() entries = [] for i,cn in enumerate([main.channels[c] for c in self.targets]): if cn.has_search: # "search" in cn.update_streams.func_code.co_varnames: __print__(dbg.PROC, "has_search:", cn.module) try: add = cn.update_streams(cat=None, search=self.q) for row in add: row["genre"] = cn.title + " " + row.get("genre", "") entries += add except: continue #main.status(main, 1.0 * i / 15) self.show_results(entries) # search text edited in text entry box def quicksearch_set(self, w, *eat, **up): # keep query string |
︙ | ︙ |