Diff
Differences From Artifact [a3cab018cd]:
- File gtk2.xml — part of check-in [bd29eb4ee9] at 2014-06-02 01:43:54 on branch trunk — Add server-search, slim down search dialog. (user: mario, size: 147103) [annotate] [blame] [check-ins using]
To Artifact [692df17e3f]:
- File
gtk2.xml
— part of check-in
[ac8632bc29]
at
2014-06-03 00:29:43
on branch trunk
— 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. (user: mario, size: 152674) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
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> |
︙ | ︙ |