Diff
Differences From Artifact [e0966116c5]:
- File gtk3.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: 145281) [annotate] [blame] [check-ins using]
To Artifact [d444cf7acc]:
- File
gtk3.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: 150970) [annotate] [blame] [check-ins using]
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> |