1
Index: src/freeguide/plugins/reminder/alarm/AlarmReminder.java
2
===================================================================
3
--- src/freeguide/plugins/reminder/alarm/AlarmReminder.java (revision 1455)
4
+++ src/freeguide/plugins/reminder/alarm/AlarmReminder.java (working copy)
7
protected final ConfigAlarm config = new ConfigAlarm( );
8
protected TVProgramme scheduledProgramme;
9
+ protected TVProgramme recordingProgramme;
10
protected JDialog scheduledDialog;
11
protected long timeForClose;
12
protected long timeForDisplay;
13
protected long scheduledDialogDisplayTime;
14
+ protected long timeForRecordStart;
15
+ protected long timeForRecordStop;
16
+ protected boolean recording = false;
17
protected MListsner mouseListener = new MListsner( );
21
public void addItemsToPopupMenu(
22
final TVProgramme programme, final JPopupMenu menu )
26
+ * menu item for highlighting
28
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
30
+ final JMenuItem hil = new JMenuItem( );
33
+ if( !isHighlighted( programme ) )
35
+ hil.setText( i18n.getLocalizedMessage( "popup.highlight.add" ) );
36
+ hil.addActionListener(
37
+ new ActionListener( )
39
+ public void actionPerformed( ActionEvent e )
41
+ setProgrammeSelection( programme, isSelected(programme) , true);
42
+ favSelectionChanged( true );
48
+ hil.setText( i18n.getLocalizedMessage( "popup.highlight.del" ) );
49
+ hil.addActionListener(
50
+ new ActionListener( )
52
+ public void actionPerformed( ActionEvent e )
54
+ setProgrammeSelection( programme, isSelected(programme), false);
55
+ favSelectionChanged( true );
62
final JMenuItem sel = new JMenuItem( );
64
if( !isSelected( programme ) )
67
public void actionPerformed( ActionEvent e )
69
- setProgrammeSelection( programme, true );
70
+ setProgrammeSelection( programme, true, true);
71
favSelectionChanged( true );
76
public void actionPerformed( ActionEvent e )
78
- setProgrammeSelection( programme, false );
79
+ setProgrammeSelection( programme, false, false);
80
favSelectionChanged( true );
87
+ final JMenuItem rec = new JMenuItem( );
89
+ Favourite favourite = getFavourite( programme );
91
+ if( favourite == null || !favourite.getRecord() )
93
+ rec.setText( i18n.getLocalizedMessage( "popup.record.add" ) );
94
+ if( favourite == null )
95
+ { // not yet in favourites, hence add.
96
+ rec.addActionListener(
97
+ new ActionListener( )
99
+ public void actionPerformed( ActionEvent e )
101
+ Favourite fav = new Favourite( );
103
+ fav.setTitleString( programme.getTitle( ) );
104
+ fav.setName( programme.getTitle( ) );
105
+ fav.setRecord( true );
107
+ addFavourite( fav );
108
+ favSelectionChanged( false );
112
+ else // if( !f.getRecord() )
113
+ { // is in favourites but not yet as recorded.
114
+ rec.addActionListener(
115
+ new ActionListener( )
117
+ public void actionPerformed( ActionEvent e )
119
+ Favourite fav = getFavourite( programme );
122
+ fav.setRecord( true );
123
+ favSelectionChanged( false );
131
+ rec.setText( i18n.getLocalizedMessage( "popup.record.del" ) );
132
+ rec.addActionListener(
133
+ new ActionListener( )
135
+ public void actionPerformed( ActionEvent e )
137
+ Favourite fav = getFavourite( programme );
140
+ fav.setRecord( false );
141
+ favSelectionChanged( false );
149
final JMenuItem fav = new JMenuItem( );
151
- if( getFavourite( programme ) == null )
152
+ if( favourite == null )
154
fav.setText( i18n.getLocalizedMessage( "popup.favourite.add" ) );
155
fav.addActionListener(
158
timeForClose = Long.MAX_VALUE;
159
timeForDisplay = Long.MAX_VALUE;
160
+ timeForRecordStart = Long.MAX_VALUE;
161
+ timeForRecordStop = Long.MAX_VALUE;
167
scheduledProgramme = null;
169
- if( config.reminderOn )
170
+ if( config.reminderOn)
175
timeForDisplay = scheduledProgramme.getStart( )
176
- config.reminderWarning;
181
catch( Exception ex )
183
Level.WARNING, "Error find next programme", ex );
186
+ if( config.recordOn)
192
+ recordingProgramme =
193
+ Application.getInstance( ).getDataStorage( ).findEarliest(
194
+ System.currentTimeMillis( )
195
+ + 0, // 1min before actual start.
196
+ new IModuleStorage.EarliestCheckAllow( )
198
+ public boolean isAllow( TVProgramme programme )
200
+ return isRecord( programme );
204
+ if( recordingProgramme != null )
207
+ timeForRecordStart = recordingProgramme.getStart( ) - 0;
208
+ timeForRecordStop = recordingProgramme.getEnd( ) + 0;
212
+ catch( Exception ex )
214
+ Application.getInstance( ).getLogger( )
216
+ Level.WARNING, "Error find next programme", ex );
221
- Math.min( timeForClose, timeForDisplay ),
222
+ Math.min( Math.min( Math.min( timeForClose, timeForDisplay ), timeForRecordStart ), timeForRecordStop ),
223
System.currentTimeMillis( ) + 300000 );
227
scheduledDialog.setVisible( true );
228
scheduledDialogDisplayTime = System.currentTimeMillis( );
230
+ // check for recording start
231
+ if( recordingProgramme != null )
233
+ if( !recording && timeForRecordStart <= System.currentTimeMillis( ) )
238
+ if( recording && timeForRecordStop <= System.currentTimeMillis( ) )
241
+ recordingProgramme = null;
250
+ * Is called when a recording should be started.
252
+ * The programme to record is stored in recrdingProgramme.
254
+ * @return true if command execution was successfull
257
+ protected boolean startRecording( )
259
+ JOptionPane optionPane =
260
+ new JOptionPane( recordingProgramme.getTitle( ), JOptionPane.INFORMATION_MESSAGE );
261
+ JDialog dlg = optionPane.createDialog(
262
+ Application.getInstance( ).getApplicationFrame( ),
263
+ "Start Recording..." );
264
+ dlg.setModal( false );
266
+ dlg.setVisible( true );
273
+ * Is called when a recording should be sopped.
275
+ * The programme we are currently recording is stored in recrdingProgramme.
277
+ * @return true if command execution was successfull
280
+ protected boolean stopRecording( )
282
+ JOptionPane optionPane =
283
+ new JOptionPane( recordingProgramme.getTitle( ), JOptionPane.INFORMATION_MESSAGE );
284
+ JDialog dlg = optionPane.createDialog(
285
+ Application.getInstance( ).getApplicationFrame( ),
286
+ "Stop Recording..." );
287
+ dlg.setModal( false );
289
+ dlg.setVisible( true );
295
+ * setProgrammSelection: set highlighting according to the selection
297
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
300
protected class MListsner implements MouseListener
302
TVProgramme programme;
306
* @param e DOCUMENT_ME!
308
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
309
+ * add parameter for highlight
311
public void mouseClicked( MouseEvent e )
313
@@ -326,11 +536,11 @@
315
if( !isSelected( programme ) )
317
- setProgrammeSelection( programme, true );
318
+ setProgrammeSelection( programme, true, true);
322
- setProgrammeSelection( programme, false );
323
+ setProgrammeSelection( programme, false, false);
326
favSelectionChanged( true );
329
/** Time in milliseconds. */
330
public long reminderWarning = 300000L;
332
+ /** Do we record. */
333
+ public boolean recordOn = false;
335
+ /** Command to issue when a programme starts. */
336
+ public String recordStartCommand = "";
338
+ /** Command to issue when a programme stops. */
339
+ public String recordStopCommand = "";
342
Index: src/freeguide/plugins/reminder/alarm/AlarmUIPanel.java
343
===================================================================
344
--- src/freeguide/plugins/reminder/alarm/AlarmUIPanel.java (revision 1455)
345
+++ src/freeguide/plugins/reminder/alarm/AlarmUIPanel.java (working copy)
347
private JTextField textWarning = null;
348
private JLabel jLabel1 = null;
349
private JTextField textGiveup = null;
350
+ private JCheckBox cbRecord = null;
351
+ private JLabel labelStart = null;
352
+ private JTextField textStart = null;
353
+ private JLabel labelStop = null;
354
+ private JTextField textStop = null;
355
private ILocalizer localizer;
359
gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL;
360
gridBagConstraints1.gridwidth = 2;
361
gridBagConstraints1.insets = new java.awt.Insets( 5, 5, 0, 5 );
364
+ GridBagConstraints gridBagConstraintsRecord = new GridBagConstraints( );
365
+ gridBagConstraintsRecord.gridx = 0;
366
+ gridBagConstraintsRecord.gridy = 6;
367
+ gridBagConstraintsRecord.fill = java.awt.GridBagConstraints.HORIZONTAL;
368
+ gridBagConstraintsRecord.gridwidth = 2;
369
+ gridBagConstraintsRecord.insets = new java.awt.Insets( 5, 5, 0, 5 );
372
+ GridBagConstraints gridBagConstraintsStart = new GridBagConstraints( );
373
+ gridBagConstraintsStart.gridx = 0;
374
+ gridBagConstraintsStart.gridy = 7;
375
+ gridBagConstraintsStart.insets = new java.awt.Insets( 5, 5, 0, 0 );
376
+ gridBagConstraintsStart.anchor = java.awt.GridBagConstraints.WEST;
377
+ labelStart = new JLabel( );
378
+ labelStart.setText(
379
+ localizer.getLocalizedMessage( "options.execute_on_start" ) );
380
+ labelStart.setDisplayedMnemonic( java.awt.event.KeyEvent.VK_S );
381
+ labelStart.setLabelFor( getTextStart( ) );
383
+ GridBagConstraints gridBagConstraintsTextStart = new GridBagConstraints( );
384
+ gridBagConstraintsTextStart.fill = java.awt.GridBagConstraints.HORIZONTAL;
385
+ gridBagConstraintsTextStart.gridx = 1;
386
+ gridBagConstraintsTextStart.gridy = 7;
387
+ gridBagConstraintsTextStart.weightx = 1.0;
388
+ gridBagConstraintsTextStart.insets = new java.awt.Insets( 5, 5, 0, 5 );
391
+ GridBagConstraints gridBagConstraintsStop = new GridBagConstraints( );
392
+ gridBagConstraintsStop.gridx = 0;
393
+ gridBagConstraintsStop.gridy = 8;
394
+ gridBagConstraintsStop.insets = new java.awt.Insets( 5, 5, 0, 0 );
395
+ gridBagConstraintsStop.anchor = java.awt.GridBagConstraints.WEST;
396
+ labelStop = new JLabel( );
398
+ localizer.getLocalizedMessage( "options.execute_on_stop" ) );
399
+ labelStop.setDisplayedMnemonic( java.awt.event.KeyEvent.VK_T );
400
+ labelStop.setLabelFor( getTextStop( ) );
402
+ GridBagConstraints gridBagConstraintsTextStop = new GridBagConstraints( );
403
+ gridBagConstraintsTextStop.fill = java.awt.GridBagConstraints.HORIZONTAL;
404
+ gridBagConstraintsTextStop.gridx = 1;
405
+ gridBagConstraintsTextStop.gridy = 8;
406
+ gridBagConstraintsTextStop.weightx = 1.0;
407
+ gridBagConstraintsTextStop.insets = new java.awt.Insets( 5, 5, 0, 5 );
411
this.setLayout( new GridBagLayout( ) );
412
this.setSize( 300, 200 );
413
this.add( getCbRemind( ), gridBagConstraints1 );
415
this.add( getTextWarning( ), gridBagConstraints3 );
416
this.add( jLabel1, gridBagConstraints4 );
417
this.add( getTextGiveup( ), gridBagConstraints5 );
419
+ this.add( getCbRecord( ), gridBagConstraintsRecord );
420
+ this.add( labelStart, gridBagConstraintsStart );
421
+ this.add( getTextStart( ), gridBagConstraintsTextStart );
422
+ this.add( labelStop, gridBagConstraintsStop );
423
+ this.add( getTextStop( ), gridBagConstraintsTextStop );
433
+ * This method initializes cbRecord
435
+ * @return javax.swing.JCheckBox
437
+ public JCheckBox getCbRecord( )
439
+ if( cbRecord == null )
441
+ cbRecord = new JCheckBox( );
443
+ localizer.getLocalizedMessage( "options.record_progs" ) );
444
+ cbRecord.setMnemonic( java.awt.event.KeyEvent.VK_E );
451
+ * This method initializes textStart
453
+ * @return javax.swing.JTextField
455
+ public JTextField getTextStart( )
457
+ if( textStart == null )
459
+ textStart = new JTextField( );
466
+ * This method initializes textStop
468
+ * @return javax.swing.JTextField
470
+ public JTextField getTextStop( )
472
+ if( textStop == null )
474
+ textStop = new JTextField( );
480
Index: src/freeguide/plugins/reminder/alarm/AlarmUIController.java
481
===================================================================
482
--- src/freeguide/plugins/reminder/alarm/AlarmUIController.java (revision 1455)
483
+++ src/freeguide/plugins/reminder/alarm/AlarmUIController.java (working copy)
485
panel.getCbRemind( ).setSelected( parent.config.reminderOn );
486
panel.getTextWarning( )
487
.setText( String.valueOf( parent.config.reminderWarning / 1000 ) );
489
panel.getTextGiveup( )
490
.setText( String.valueOf( parent.config.reminderGiveUp / 1000 ) );
492
+ panel.getCbRecord( ).setSelected( parent.config.recordOn );
493
+ panel.getTextStart( )
494
+ .setText( parent.config.recordStartCommand );
495
+ panel.getTextStop( )
496
+ .setText( parent.config.recordStopCommand );
501
panel.getTextWarning( ).getText( ) ) * 1000L;
502
parent.config.reminderGiveUp = Long.parseLong(
503
panel.getTextGiveup( ).getText( ) ) * 1000L;
504
+ parent.config.recordOn = panel.getCbRecord( ).isSelected( );
505
+ parent.config.recordStartCommand = panel.getTextStart( )
507
+ parent.config.recordStopCommand = panel.getTextStop( )
511
Index: src/freeguide/plugins/ui/horizontal/manylabels/ConfigureUIPanel.java
512
===================================================================
513
--- src/freeguide/plugins/ui/horizontal/manylabels/ConfigureUIPanel.java (revision 1455)
514
+++ src/freeguide/plugins/ui/horizontal/manylabels/ConfigureUIPanel.java (working copy)
516
private JLabel labelColorMovie;
517
private JLabel labelColorChannel;
518
private JLabel labelColorSelected;
521
+ * new entries for favourite colour and guide colour
523
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
525
+ private JLabel labelColorFavourite;
526
+ private JLabel labelColorGuide;
527
private JPanel panelColorMovie;
528
private JPanel panelColorSelected;
529
private JPanel panelColorChannel;
532
+ * new entries for favourite colour and guide colour
534
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
536
+ private JPanel panelColorFavourite;
537
+ private JPanel panelColorGuide;
538
private JButton btnColorMovie;
539
private JButton btnColorChannel;
540
private JButton btnColorSelected;
543
+ * new entries for favourite colour and guide colour
545
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
547
+ private JButton btnColorFavourite;
548
+ private JButton btnColorGuide;
549
protected ILocalizer localizer;
550
private JTextField dayStart;
551
private JLabel jLabel;
553
GridBagConstraints gridBagConstraints61 = new GridBagConstraints( );
554
GridBagConstraints gridBagConstraints72 = new GridBagConstraints( );
555
GridBagConstraints gridBagConstraints92 = new GridBagConstraints( );
556
+ GridBagConstraints gridBagConstraints21 = new GridBagConstraints( ); // add
558
labelColorNormal = new JLabel( );
559
labelColorChannel = new JLabel( );
560
labelColorSelected = new JLabel( );
563
+ * new entries for favourite colour and guide colour
565
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
567
+ labelColorFavourite = new JLabel( );
568
+ labelColorGuide = new JLabel( );
570
labelColorMovie = new JLabel( );
572
GridBagConstraints gridBagConstraints19 = new GridBagConstraints( );
573
GridBagConstraints gridBagConstraints20 = new GridBagConstraints( );
576
+ * new entries for favourite colour and guide colour
578
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
580
+ GridBagConstraints gridBagConstraints22 = new GridBagConstraints( );
581
+ GridBagConstraints gridBagConstraints23 = new GridBagConstraints( );
583
GridBagConstraints gridBagConstraints18 = new GridBagConstraints( );
584
GridBagConstraints gridBagConstraints15 = new GridBagConstraints( );
585
GridBagConstraints gridBagConstraints14 = new GridBagConstraints( );
586
GridBagConstraints gridBagConstraints16 = new GridBagConstraints( );
589
+ * new entries for favourite colour and guide colour
591
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
593
+ GridBagConstraints gridBagConstraints17 = new GridBagConstraints( );
594
+ GridBagConstraints gridBagConstraints118 = new GridBagConstraints( );
596
GridBagConstraints gridBagConstraints81 = new GridBagConstraints( );
597
GridBagConstraints gridBagConstraints71 = new GridBagConstraints( );
598
GridBagConstraints gridBagConstraints6 = new GridBagConstraints( );
599
GridBagConstraints gridBagConstraints101 = new GridBagConstraints( );
600
GridBagConstraints gridBagConstraints111 = new GridBagConstraints( );
602
+ * new entries for favourite colour and guide colour
604
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
606
+ GridBagConstraints gridBagConstraints112 = new GridBagConstraints( );
607
+ GridBagConstraints gridBagConstraints113 = new GridBagConstraints( );
609
GridBagConstraints gridBagConstraints50 = new GridBagConstraints( );
610
GridBagConstraints gridBagConstraints5 = new GridBagConstraints( );
611
GridBagConstraints gridBagConstraints41 = new GridBagConstraints( );
612
@@ -192,15 +252,51 @@
613
labelColorSelected.setText(
614
localizer.getLocalizedMessage( "selected_colour" ) );
617
+ * new entries for favourite colour and guide colour
619
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
621
+ gridBagConstraints112.gridx = 0;
622
+ gridBagConstraints112.gridy = 8;
623
+ labelColorFavourite.setLabelFor( getBtnColorFavourite( ) );
624
+ labelColorFavourite.setDisplayedMnemonic( java.awt.event.KeyEvent.VK_F );
625
+ labelColorFavourite.setText(
626
+ localizer.getLocalizedMessage( "favourite_colour" ) );
628
+ gridBagConstraints113.gridx = 0;
629
+ gridBagConstraints113.gridy = 9;
630
+ labelColorGuide.setLabelFor( getBtnColorGuide( ) );
631
+ labelColorGuide.setDisplayedMnemonic( java.awt.event.KeyEvent.VK_G );
632
+ labelColorGuide.setText(
633
+ localizer.getLocalizedMessage( "guide_colour" ) );
636
gridBagConstraints101.anchor = java.awt.GridBagConstraints.WEST;
638
gridBagConstraints101.insets = new java.awt.Insets( 5, 5, 0, 0 );
639
gridBagConstraints111.anchor = java.awt.GridBagConstraints.WEST;
640
gridBagConstraints50.anchor = java.awt.GridBagConstraints.WEST;
643
+ * new entries for favourite colour and guide colour
645
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
647
+ gridBagConstraints112.anchor = java.awt.GridBagConstraints.WEST;
648
+ gridBagConstraints113.anchor = java.awt.GridBagConstraints.WEST;
650
gridBagConstraints111.insets = new java.awt.Insets( 5, 5, 0, 0 );
651
gridBagConstraints50.insets = new java.awt.Insets( 5, 5, 0, 0 );
654
+ * new entries for favourite colour and guide colour
656
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
658
+ gridBagConstraints112.insets = new java.awt.Insets( 5, 5, 0, 0 );
659
+ gridBagConstraints113.insets = new java.awt.Insets( 5, 5, 0, 0 );
661
gridBagConstraints14.gridx = 1;
662
gridBagConstraints14.gridy = 6;
663
gridBagConstraints14.fill = java.awt.GridBagConstraints.BOTH;
665
gridBagConstraints16.gridwidth = 2;
666
gridBagConstraints16.insets = new java.awt.Insets( 5, 5, 0, 0 );
669
+ * new entries for favourite colour and guide colour
671
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
673
+ gridBagConstraints17.gridx = 1;
674
+ gridBagConstraints17.gridy = 8;
675
+ gridBagConstraints17.fill = java.awt.GridBagConstraints.BOTH;
676
+ gridBagConstraints17.gridwidth = 2;
677
+ gridBagConstraints17.insets = new java.awt.Insets( 5, 5, 0, 0 );
679
+ gridBagConstraints118.gridx = 1;
680
+ gridBagConstraints118.gridy = 9;
681
+ gridBagConstraints118.fill = java.awt.GridBagConstraints.BOTH;
682
+ gridBagConstraints118.gridwidth = 2;
683
+ gridBagConstraints118.insets = new java.awt.Insets( 5, 5, 0, 0 );
685
gridBagConstraints15.gridx = 1;
686
gridBagConstraints15.gridy = 7;
687
gridBagConstraints15.fill = java.awt.GridBagConstraints.BOTH;
689
gridBagConstraints20.gridy = 5;
690
gridBagConstraints20.insets = new java.awt.Insets( 5, 5, 0, 5 );
693
+ * new entries for favourite colour and guide colour
695
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
697
+ gridBagConstraints22.gridx = 3;
698
+ gridBagConstraints22.gridy = 8;
699
+ gridBagConstraints22.insets = new java.awt.Insets( 5, 5, 0, 5 );
701
+ gridBagConstraints23.gridx = 3;
702
+ gridBagConstraints23.gridy = 9;
703
+ gridBagConstraints23.insets = new java.awt.Insets( 5, 5, 0, 5 );
705
gridBagConstraints4.gridx = 0;
706
gridBagConstraints4.gridy = 1;
707
gridBagConstraints4.anchor = java.awt.GridBagConstraints.WEST;
709
gridBagConstraints9.insets = new java.awt.Insets( 5, 5, 0, 5 );
710
gridBagConstraints13.gridx = 2;
712
- gridBagConstraints13.gridy = 9;
713
+ gridBagConstraints13.gridy = 10;
715
gridBagConstraints13.weightx = 1.0D;
717
@@ -308,14 +434,14 @@
718
gridBagConstraints5.insets = new java.awt.Insets( 5, 5, 0, 5 );
719
gridBagConstraints42.gridx = 1;
721
- gridBagConstraints42.gridy = 10;
722
+ gridBagConstraints42.gridy = 11;
724
gridBagConstraints42.fill = java.awt.GridBagConstraints.HORIZONTAL;
726
gridBagConstraints42.insets = new java.awt.Insets( 5, 5, 0, 5 );
727
gridBagConstraints51.gridx = 0;
729
- gridBagConstraints51.gridy = 10;
730
+ gridBagConstraints51.gridy = 11;
732
gridBagConstraints51.anchor = java.awt.GridBagConstraints.WEST;
736
gridBagConstraints61.gridx = 1;
738
- gridBagConstraints61.gridy = 11;
739
+ gridBagConstraints61.gridy = 12;
741
gridBagConstraints61.fill = java.awt.GridBagConstraints.BOTH;
744
gridBagConstraints61.insets = new java.awt.Insets( 5, 5, 0, 5 );
745
gridBagConstraints72.gridx = 0;
747
- gridBagConstraints72.gridy = 11;
748
+ gridBagConstraints72.gridy = 12;
750
gridBagConstraints72.anchor = java.awt.GridBagConstraints.WEST;
754
gridBagConstraints92.gridx = 0;
756
- gridBagConstraints92.gridy = 12;
757
+ gridBagConstraints92.gridy = 13;
759
gridBagConstraints92.gridwidth = 4;
762
gridBagConstraints92.insets = new java.awt.Insets( 5, 5, 0, 5 );
763
gridBagConstraints11.gridx = 0;
765
- gridBagConstraints11.gridy = 13;
766
+ gridBagConstraints11.gridy = 14;
768
gridBagConstraints11.anchor = java.awt.GridBagConstraints.WEST;
772
gridBagConstraints11.insets = new java.awt.Insets( 5, 5, 0, 5 );
774
+ gridBagConstraints21.gridy = 15;
776
+ gridBagConstraints21.anchor = java.awt.GridBagConstraints.WEST;
778
+ gridBagConstraints21.gridwidth = 4;
780
+ gridBagConstraints21.insets = new java.awt.Insets( 5, 5, 0, 5 );
781
gridBagConstraints31.gridx = 0;
783
- gridBagConstraints31.gridy = 14;
784
+ gridBagConstraints31.gridy = 16;
786
gridBagConstraints31.gridwidth = 4;
789
this.add( getBtnColorMovie( ), gridBagConstraints18 );
790
this.add( getPanelColorMovie( ), gridBagConstraints14 );
791
this.add( getPanelColorSelected( ), gridBagConstraints16 );
794
+ * new entries for favourite colour and guide colour
796
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
798
+ this.add( getPanelColorFavourite( ), gridBagConstraints17 );
799
+ this.add( getBtnColorFavourite( ), gridBagConstraints22 );
800
+ this.add( getPanelColorGuide( ), gridBagConstraints118 );
801
+ this.add( getBtnColorGuide( ), gridBagConstraints23 );
803
this.add( getBtnColorNormal( ), gridBagConstraints81 );
804
this.add( getPanelColorNormal( ), gridBagConstraints71 );
805
this.add( labelColorNormal, gridBagConstraints6 );
807
this.add( getBtnColorSelected( ), gridBagConstraints20 );
808
this.add( labelColorChannel, gridBagConstraints111 );
809
this.add( labelColorSelected, gridBagConstraints50 );
812
+ * new entries for favourite colour and guide colour
814
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
816
+ this.add( labelColorFavourite, gridBagConstraints112 );
817
+ this.add( getBtnColorFavourite( ), gridBagConstraints22);
818
+ this.add( labelColorGuide, gridBagConstraints113 );
819
+ this.add( getBtnColorGuide( ), gridBagConstraints23);
821
this.add( labelColorMovie, gridBagConstraints101 );
822
this.add( getPanelSpacer( ), gridBagConstraints13 );
823
this.add( getJPanel( ), gridBagConstraints110 );
825
return panelColorSelected;
830
+ * Return the favourite colout box
832
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
834
+ * @return javax.swing.JPanel
836
+ protected JPanel getPanelColorFavourite( )
838
+ if( panelColorFavourite == null )
840
+ panelColorFavourite = new JPanel( );
843
+ return panelColorFavourite;
847
+ * Return the guide colout box
849
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
851
+ * @return javax.swing.JPanel
853
+ protected JPanel getPanelColorGuide( )
855
+ if( panelColorGuide == null )
857
+ panelColorGuide = new JPanel( );
860
+ return panelColorGuide;
864
* This method initializes jPanel5
868
return btnColorSelected;
872
+ * Returns the "..." button to change favourite colour
874
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
876
+ * @return javax.swing.JButton
878
+ protected JButton getBtnColorFavourite( )
880
+ if( btnColorFavourite == null )
882
+ btnColorFavourite = new JButton( );
883
+ btnColorFavourite.setText( "..." );
886
+ return btnColorFavourite;
890
+ * Returns the "..." button to change favourite colour
892
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
894
+ * @return javax.swing.JButton
896
+ protected JButton getBtnColorGuide( )
898
+ if( btnColorGuide == null )
900
+ btnColorGuide = new JButton( );
901
+ btnColorGuide.setText( "..." );
904
+ return btnColorGuide;
908
* This method initializes jTextField
910
* @return javax.swing.JTextField
911
Index: src/freeguide/plugins/ui/horizontal/manylabels/HorizontalViewerConfig.java
912
===================================================================
913
--- src/freeguide/plugins/ui/horizontal/manylabels/HorizontalViewerConfig.java (revision 1455)
914
+++ src/freeguide/plugins/ui/horizontal/manylabels/HorizontalViewerConfig.java (working copy)
917
/** Default colour of a ticked programme */
918
public Color colorTicked = new Color( 204, 255, 204 );
921
+ * new entries for favourite colour and guide colour
923
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
925
+ /** Default colour of a favourite and guide programme */
926
+ public Color colorFavourite = new Color( 204, 204, 255 );
927
+ public Color colorGuide = new Color( 255, 223, 181 );
930
public boolean displayAlignToLeft = true;
931
Index: src/freeguide/plugins/ui/horizontal/manylabels/JLabelProgramme.java
932
===================================================================
933
--- src/freeguide/plugins/ui/horizontal/manylabels/JLabelProgramme.java (revision 1455)
934
+++ src/freeguide/plugins/ui/horizontal/manylabels/JLabelProgramme.java (working copy)
936
protected static Border MOVIE_BORDER;
937
protected static Border INGUIDE_BORDER;
938
protected static Border FOCUSED_BORDER;
940
+ * Setup border colors
942
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
944
+ * inserted: borders for favourite and selected
946
+ protected static Border FAVOURITE_BORDER;
947
+ protected static Border GUIDE_BORDER;
949
/** Standard reminder. */
950
protected static IModuleReminder REMINDER;
955
+ /** Square shape. */
956
+ protected final static Rectangle SQUARE_SHAPE = new Rectangle( 125, 650, 350, 350 );
958
/** Programme for current label. */
959
final protected TVProgramme programme;
961
/** Parent controller. */
962
final protected HorizontalViewer controller;
964
- /** Need to draw heart. */
965
+ /** Need to draw heart symbol. */
966
protected boolean isDrawHeart;
968
+ /** Need to draw square symbol (=record). */
969
+ protected boolean isDrawSquare;
971
/** Cached tooltip text. */
972
private String tooltip;
973
protected final boolean moveNames;
975
this.moveNames = moveNames;
976
setText( getTitle( programme ) );
981
setFocusable( true );
982
addMouseListener( main.handlers.labelProgrammeMouseListener );
983
@@ -184,10 +199,24 @@
986
* Setup colors for current label.
988
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
989
+ * changed: is Highlighted instead of selected
991
public void setupColors( )
993
+ if( ( REMINDER != null ) && REMINDER.getFavourite( programme ) != null && REMINDER.isHighlighted( programme ))
995
- if( ( REMINDER != null ) && REMINDER.isSelected( programme ) )
996
+ setBackground( controller.config.colorFavourite );
997
+ setBorder( FAVOURITE_BORDER );
1000
+ else if( ( REMINDER != null) && REMINDER.isSelected( programme ) && REMINDER.isHighlighted( programme )) // is selected??
1002
+ setBackground( controller.config.colorGuide );
1003
+ setBorder( GUIDE_BORDER );
1005
+ else if( ( REMINDER != null ) && REMINDER.isHighlighted( programme ) ) // is highlighted?
1007
setBackground( controller.config.colorTicked );
1008
setBorder( INGUIDE_BORDER );
1009
@@ -241,21 +270,36 @@
1010
FOCUSED_BORDER = BorderFactory.createCompoundBorder(
1011
BorderFactory.createLineBorder( Color.BLUE, 2 ),
1012
BorderFactory.createLineBorder( main.config.colorNonTicked, 1 ) );
1014
+ * Setup border colors
1016
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1018
+ * inserted: borders for favourite and selected
1020
+ GUIDE_BORDER = BorderFactory.createCompoundBorder(
1021
+ BorderFactory.createLineBorder( Color.BLACK, 1 ),
1022
+ BorderFactory.createLineBorder( main.config.colorGuide, 2 ) );
1023
+ FAVOURITE_BORDER = BorderFactory.createCompoundBorder(
1024
+ BorderFactory.createLineBorder( Color.BLACK, 1 ),
1025
+ BorderFactory.createLineBorder( main.config.colorFavourite, 2 ) );
1029
* Setup need to draw heart for current label.
1031
- protected void setupHeart( )
1032
+ protected void setupSymbols( )
1034
if( REMINDER == null )
1036
isDrawHeart = false;
1037
+ isDrawSquare = false; // for recording.
1041
- isDrawHeart = ( (BaseModuleReminder)REMINDER ).getFavourite(
1042
- programme ) != null;
1043
+ freeguide.common.lib.fgspecific.selection.Favourite f = ( (BaseModuleReminder)REMINDER ).getFavourite( programme );
1044
+ isDrawHeart = (f != null);
1045
+ isDrawSquare = (f != null && f.getRecord( ) );
1049
@@ -338,8 +382,15 @@
1051
graphics.fill( HEART_SHAPE );
1053
+ if( isDrawSquare )
1055
+ graphics.setColor( new Color( 175, 0, 0 ) );
1056
+ graphics.fill( SQUARE_SHAPE );
1059
graphics.setTransform( originalTransform );
1065
Index: src/freeguide/plugins/ui/horizontal/manylabels/ConfigureUIController.java
1066
===================================================================
1067
--- src/freeguide/plugins/ui/horizontal/manylabels/ConfigureUIController.java (revision 1455)
1068
+++ src/freeguide/plugins/ui/horizontal/manylabels/ConfigureUIController.java (working copy)
1071
panelColor = panel.getPanelColorSelected( );
1075
+ * new entries for favourite colour and guide colour
1077
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1079
+ else if( e.getSource( ) == panel.getBtnColorFavourite( ) )
1081
+ panelColor = panel.getPanelColorFavourite( );
1083
+ else if( e.getSource( ) == panel.getBtnColorGuide( ) )
1085
+ panelColor = panel.getPanelColorGuide( );
1087
else if( e.getSource( ) == panel.getBtnColorNormal( ) )
1089
panelColor = panel.getPanelColorNormal( );
1090
@@ -139,6 +153,15 @@
1091
config.colorChannel = panel.getPanelColorChannel( ).getBackground( );
1092
config.colorMovie = panel.getPanelColorMovie( ).getBackground( );
1093
config.colorTicked = panel.getPanelColorSelected( ).getBackground( );
1096
+ * new entries for favourite colour and guide colour
1098
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1100
+ config.colorFavourite = panel.getPanelColorFavourite( ).getBackground( );
1101
+ config.colorGuide = panel.getPanelColorGuide( ).getBackground( );
1103
config.colorNonTicked = panel.getPanelColorNormal( ).getBackground( );
1104
config.displayTooltips = panel.getCbDisplayTooltips( ).isSelected( );
1105
config.displayTime = panel.getCbDrawTime( ).isSelected( );
1106
@@ -183,6 +206,15 @@
1107
panel.getPanelColorChannel( ).setBackground( config.colorChannel );
1108
panel.getPanelColorMovie( ).setBackground( config.colorMovie );
1109
panel.getPanelColorSelected( ).setBackground( config.colorTicked );
1112
+ * new entries for favourite colour and guide colour
1114
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1116
+ panel.getPanelColorFavourite( ).setBackground( config.colorFavourite );
1117
+ panel.getPanelColorGuide( ).setBackground( config.colorGuide );
1119
panel.getPanelColorNormal( ).setBackground( config.colorNonTicked );
1121
panel.getBtnFont( ).addActionListener(
1122
@@ -215,6 +247,15 @@
1124
panel.getBtnColorChannel( ).addActionListener( colorBtnAction );
1125
panel.getBtnColorSelected( ).addActionListener( colorBtnAction );
1128
+ * new entries for favourite colour and guide colour
1130
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1132
+ panel.getBtnColorFavourite( ).addActionListener( colorBtnAction );
1133
+ panel.getBtnColorGuide( ).addActionListener( colorBtnAction );
1135
panel.getBtnColorMovie( ).addActionListener( colorBtnAction );
1136
panel.getBtnColorNormal( ).addActionListener( colorBtnAction );
1137
panel.getSliderHeight( ).addChangeListener( sliderChange );
1138
Index: src/freeguide/plugins/ui/horizontal/manylabels/HorizontalViewerHandlers.java
1139
===================================================================
1140
--- src/freeguide/plugins/ui/horizontal/manylabels/HorizontalViewerHandlers.java (revision 1455)
1141
+++ src/freeguide/plugins/ui/horizontal/manylabels/HorizontalViewerHandlers.java (working copy)
1142
@@ -240,8 +240,12 @@
1144
public static class LabelProgrammeActionMap extends ActionMap
1148
* Creates a new LabelProgrammeActionMap object.
1150
+ * set highlighting according to the favourite selection
1152
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1154
public LabelProgrammeActionMap( )
1156
@@ -315,8 +319,18 @@
1158
final boolean isSelected =
1159
reminder.isSelected( label.getProgramme( ) );
1160
+ final boolean isHighlighted =
1161
+ reminder.isHighlighted( label.getProgramme( ) );
1162
+ if (isSelected && !isHighlighted) {
1163
reminder.setProgrammeSelection(
1164
- label.getProgramme( ), !isSelected );
1165
+ label.getProgramme( ), !isSelected , false);
1166
+ } else if (!isSelected && isHighlighted) {
1167
+ reminder.setProgrammeSelection(
1168
+ label.getProgramme( ), !isSelected , true);
1170
+ reminder.setProgrammeSelection(
1171
+ label.getProgramme( ), !isSelected , !isHighlighted);
1173
label.controller.redrawCurrentProgramme( );
1176
Index: src/freeguide/common/plugininterfaces/BaseModuleReminder.java
1177
===================================================================
1178
--- src/freeguide/common/plugininterfaces/BaseModuleReminder.java (revision 1455)
1179
+++ src/freeguide/common/plugininterfaces/BaseModuleReminder.java (working copy)
1180
@@ -145,7 +145,40 @@
1186
+ * Check if programme is highlighted.
1188
+ * @param programme programme
1190
+ * @return true if programme highlighted
1192
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1194
+ public boolean isHighlighted( TVProgramme programme )
1196
+ synchronized( getReminderConfig( ) )
1198
+ ManualSelection sel = getManualSelection( programme );
1202
+ return sel.isHighlighted( );
1208
+ Favourite fav = getFavourite( programme );
1210
+ return fav != null;
1218
* Check if programme in the favourites or manual selection list.
1220
* @param programme programme
1221
@@ -175,29 +208,51 @@
1225
+ * Check if programme wants to be recorded.
1227
+ * @param programme programme
1229
+ * @return true if programme selected
1231
+ public boolean isRecord( TVProgramme programme )
1233
+ synchronized( getReminderConfig( ) )
1235
+ Favourite fav = getFavourite( programme );
1236
+ return ( fav != null && fav.getRecord() );
1242
* Add/remove programme to selection list.
1244
* @param programme programme
1245
* @param newSelection DOCUMENT ME!
1247
+ * new entries for favourite colour and guide colour
1249
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1251
public void setProgrammeSelection(
1252
- final TVProgramme programme, final boolean newSelection )
1253
+ final TVProgramme programme, final boolean newSelection, final boolean newHighlight)
1255
synchronized( getReminderConfig( ) )
1257
ManualSelection sel = getManualSelection( programme );
1262
sel.setSelected( newSelection );
1263
+ sel.setHighlighted(newHighlight);
1269
getReminderConfig( ).manualSelectionList.add(
1270
- new ManualSelection( programme, newSelection ) );
1272
+ new ManualSelection( programme, newSelection , newHighlight) );
1276
Index: src/freeguide/common/plugininterfaces/IModuleReminder.java
1277
===================================================================
1278
--- src/freeguide/common/plugininterfaces/IModuleReminder.java (revision 1455)
1279
+++ src/freeguide/common/plugininterfaces/IModuleReminder.java (working copy)
1281
public void stop( );
1284
+ * Check if programme is highlighted.
1286
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1288
+ * @param programme programme
1290
+ * @return true if highlighted
1292
+ public boolean isHighlighted( TVProgramme programme );
1296
* Check if programme is selected.
1298
* @param programme programme
1301
* @param programme programme
1302
* @param newSelection DOCUMENT ME!
1304
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1305
+ * add parameter for highlight
1307
public void setProgrammeSelection(
1308
- final TVProgramme programme, final boolean newSelection );
1309
+ final TVProgramme programme, final boolean newSelection, final boolean newHighlight);
1312
* Add items to main frame menu.
1313
Index: src/freeguide/common/gui/FavouriteEditorDialog.java
1314
===================================================================
1315
--- src/freeguide/common/gui/FavouriteEditorDialog.java (revision 1455)
1316
+++ src/freeguide/common/gui/FavouriteEditorDialog.java (working copy)
1318
private javax.swing.JLabel labDayOfWeek;
1319
private javax.swing.JLabel labName;
1320
private javax.swing.JLabel labTimeFormat;
1321
+ private javax.swing.JCheckBox chkRecord;
1323
// private javax.swing.JLabel labTimeFormat1;
1324
private javax.swing.JLabel labTitle;
1326
cmbDayOfWeek.setSelectedIndex( favourite.getDayOfWeek( ) );
1329
+ chkRecord.setSelected( favourite.getRecord() );
1336
favourite.setDayOfWeek( -1 );
1338
+ // set the record flag
1339
+ favourite.setRecord( chkRecord.isSelected() );
1343
@@ -497,6 +502,14 @@
1344
cmbDayOfWeekActionPerformed( evt );
1347
+ chkRecord.addActionListener(
1348
+ new java.awt.event.ActionListener( )
1350
+ public void actionPerformed( java.awt.event.ActionEvent evt )
1352
+ chkRecordActionPerformed( evt );
1355
butOK.addActionListener(
1356
new java.awt.event.ActionListener( )
1358
@@ -678,6 +691,20 @@
1359
gridBagConstraints.insets = new java.awt.Insets( 5, 5, 5, 5 );
1360
gridBagConstraints.weightx = 0.9;
1361
getContentPane( ).add( txtName, gridBagConstraints );
1363
+ chkRecord = new javax.swing.JCheckBox(
1364
+ Application.getInstance( )
1365
+ .getLocalizedMessage( "record" ) );
1366
+ gridBagConstraints = new java.awt.GridBagConstraints( );
1367
+ gridBagConstraints.gridx = 1;
1368
+ gridBagConstraints.gridy = 8;
1369
+ gridBagConstraints.gridwidth = 3;
1370
+ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
1371
+ gridBagConstraints.insets = new java.awt.Insets( 5, 5, 5, 5 ); // TODO what's this, correct?
1372
+ gridBagConstraints.weightx = 0.9;
1373
+ getContentPane( ).add( chkRecord, gridBagConstraints );
1376
jPanel1 = new javax.swing.JPanel( new java.awt.GridBagLayout( ) );
1377
butOK = new javax.swing.JButton(
1378
Application.getInstance( ).getLocalizedMessage( "ok" ) );
1380
jPanel1.add( butCancel, gridBagConstraints );
1381
gridBagConstraints = new java.awt.GridBagConstraints( );
1382
gridBagConstraints.gridx = 0;
1383
- gridBagConstraints.gridy = 8;
1384
+ gridBagConstraints.gridy = 9;
1385
gridBagConstraints.gridwidth = 4;
1386
gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
1387
getContentPane( ).add( jPanel1, gridBagConstraints );
1388
@@ -780,6 +807,10 @@
1392
+ private void chkRecordActionPerformed( java.awt.event.ActionEvent evt )
1397
* Description of the Method
1399
Index: src/freeguide/common/lib/fgspecific/selection/SelectionManager.java
1400
===================================================================
1401
--- src/freeguide/common/lib/fgspecific/selection/SelectionManager.java (revision 1455)
1402
+++ src/freeguide/common/lib/fgspecific/selection/SelectionManager.java (working copy)
1406
storage.manualSelectionList.add(
1407
- new ManualSelection( programme, true ) );
1408
+ new ManualSelection( programme, true , true) );
1415
storage.manualSelectionList.add(
1416
- new ManualSelection( programme, false ) );
1417
+ new ManualSelection( programme, false, false) );
1421
Index: src/freeguide/common/lib/fgspecific/selection/ManualSelection.java
1422
===================================================================
1423
--- src/freeguide/common/lib/fgspecific/selection/ManualSelection.java (revision 1455)
1424
+++ src/freeguide/common/lib/fgspecific/selection/ManualSelection.java (working copy)
1427
public boolean selected;
1429
+ /** PROGRAMM IS HIGHLIGHTED */
1430
+ public boolean highlighted;
1433
* Creates a new ManualSelection object.
1436
* @param selected DOCUMENT ME!
1438
public ManualSelection(
1439
- final TVProgramme programme, final boolean selected )
1440
+ final TVProgramme programme, final boolean selected, final boolean highlighted )
1442
this.channelID = programme.getChannel( ).getID( );
1446
this.selected = selected;
1448
+ this.highlighted = highlighted || selected;
1458
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1460
+ * @return Returns the highlighted status.
1462
+ public boolean isHighlighted( )
1464
+ return highlighted;
1471
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1473
+ * @param highlighted the highlighted to set.
1475
+ public void setHighlighted( final boolean highlighted )
1477
+ this.highlighted = highlighted;
1484
* @return Returns the selected status.
1485
Index: src/freeguide/common/lib/fgspecific/selection/Favourite.java
1486
===================================================================
1487
--- src/freeguide/common/lib/fgspecific/selection/Favourite.java (revision 1455)
1488
+++ src/freeguide/common/lib/fgspecific/selection/Favourite.java (working copy)
1490
/** Day of week, or -1 if any. */
1491
public int dayOfWeek = -1;
1493
+ /** Do we want to record it or not. */
1494
+ public boolean doRecord = false;
1497
* Constructor for the Favourite object
1500
result.afterTime = afterTime;
1501
result.beforeTime = beforeTime;
1502
result.dayOfWeek = dayOfWeek;
1503
+ result.doRecord = doRecord;
1507
@@ -248,6 +252,16 @@
1511
+ * Getst he doRecord attribute of the Favourite object
1513
+ * @return The doRecord value
1515
+ public boolean getRecord( )
1521
* Sets the name attribute of the Favourite object
1523
* @param name The new name value
1524
@@ -328,5 +342,16 @@
1525
this.dayOfWeek = dayOfWeek;
1530
+ * Sets the record flag.
1532
+ * @param doRecord If we want it to have the record flag or not.
1534
+ public void setRecord( boolean doRecord )
1536
+ this.doRecord = doRecord;
1539
// The day of the week it's on
1541
Index: src/resources/i18n/reminder_alarm.en.properties
1542
===================================================================
1543
--- src/resources/i18n/reminder_alarm.en.properties (revision 1455)
1544
+++ src/resources/i18n/reminder_alarm.en.properties (working copy)
1547
menu.label=Favourites...
1550
+ * new entries for favourite system
1552
+ * @author Patrick Huber, Annetta Schaad (aschaad at hotmail.com)
1554
+popup.highlight.add=Highlight
1555
+popup.highlight.del=Remove Highlight
1557
popup.selection.add=Add to guide
1558
popup.selection.del=Remove from guide
1559
+popup.record.add=Record
1560
+popup.record.del=Do not record
1561
popup.favourite.add=Add to favourites
1562
popup.favourite.del=Remove from favourites
1563
popup.favourite.del.title=Remove favourite?
1565
options.remind_me_of_progs=Remind me of progs
1566
options.seconds_warning=Seconds warning
1567
options.give_up_after_secs=Give up after (secs)
1569
+options.record_progs=Record progs
1570
+options.execute_on_start=Execute on start
1571
+options.execute_on_stop=Execute on stop
1573
Index: src/resources/i18n/ui_horizontal_manylabels.en.properties
1574
===================================================================
1575
--- src/resources/i18n/ui_horizontal_manylabels.en.properties (revision 1455)
1576
+++ src/resources/i18n/ui_horizontal_manylabels.en.properties (working copy)
1578
movie_colour=Movie colour
1579
channel_colour=Channel colour
1580
selected_colour=Selected prog. colour
1581
+favourite_colour=Favourite colour
1582
+guide_colour=Guide colour
1584
# freeguide/gui/options/TimeOptionPanel.java
1586
day_starts_at=Day starts at
1587
Index: src/resources/i18n/MessagesBundle.en.properties
1588
===================================================================
1589
--- src/resources/i18n/MessagesBundle.en.properties (revision 1455)
1590
+++ src/resources/i18n/MessagesBundle.en.properties (working copy)
1592
times_should_be_entered_as_hhmm=(Times should be entered as "hh:mm")
1597
# freeguide/gui/dialogs/FavouritesListDialog.java
added
removed
zurich.patch
