Changeset 554

Show
Ignore:
Timestamp:
02/18/07 15:16:58 (2 years ago)
Author:
nicfit
Message:

Man page updates and move

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Makefile.in

    r522 r554  
    7979        install -m 755 -d ${mandir} 
    8080        install -m 755 -d ${mandir}/man1 
    81         install -m 644 etc/mesk.1 ${mandir}/man1 
     81        install -m 644 doc/mesk.1 ${mandir}/man1 
    8282        gzip -f -9 ${mandir}/man1/mesk.1 
    8383 
    …… 
    126126        -rm -rf autom4te*.cache ${DIST_NAME} ${DIST_GZ} ${DIST_WWW} 
    127127        -rm setup.py 
    128         -rm etc/mesk.1.gz 
     128        -rm doc/mesk.1.gz 
    129129        -rm -f config.* 
    130130        -rm -rf src/mesk/info.py 
    …… 
    141141        -rm README 
    142142        -rm -f configure 
    143         -rm etc/mesk.1 
     143        -rm doc/mesk.1 
    144144        -rm ./etc/mesk.desktop 
    145145 
    …… 
    160160        mkdir ${DIST_NAME}/etc 
    161161        cp etc/mesk.desktop.in ${DIST_NAME}/etc 
    162         cp etc/mesk.1.in ${DIST_NAME}/etc 
     162        cp doc/mesk.1.in ${DIST_NAME}/doc 
    163163        cp etc/mesk-@PACKAGE_VERSION@.ebuild ${DIST_NAME}/etc 
    164164 

  • trunk/configure.ac

    r511 r554  
    4545                 src/mesk/info.py\ 
    4646                 scripts/mesk\ 
    47                  etc/mesk.1]) 
     47                 doc/mesk.1]) 
    4848if test -f README.in; then 
    4949   AC_CONFIG_FILES([README]) 

  • trunk/doc/mesk.1.in

    r423 r554  
    22.SH "NAME" 
    33.B mesk 
    4 \- Python/Gtk+ audio player 
     4\- Gtk+ audio player 
    55.SH "SYNOPSIS" 
    66.B mesk 
    …… 
    1313 
    1414.SH "OPTIONS" 
    15 \fB\-h, \fB\-\-help\fR 
    16 Shows a brief help string and exit. 
     15\fB\-h\fR, \fB\-\-help\fR 
     16Display program usage and exit. 
    1717.TP 
    1818\fB\-\-version\fR 
    19 Show program's version number and exit. 
     19Display program version and exit. 
    2020.TP 
    21 \fB-p \fRNAME, \fB\-\-profile=\fRNAME\fR 
    22 Run with profile NAME.  If the profile does not exist one is created you. 
     21\fB-p \fRNAME, \fB\-\-profile\fR=NAME 
     22Run with profile NAME.  If the profile does not exist it is created. 
     23 
     24.SH "REMOTE CONTROL OPTIONS" 
     25\fB\-\-stop\fR 
     26Stop playback. 
    2327.TP 
    24 \fB-l \fRLEVEL, \fB\-\-log-level=\fRLEVEL\fR 
     28\fB\-\-play\fR 
     29Start playback. 
     30.TP 
     31\fB\-\-pause\fR 
     32Pause playback. 
     33.TP 
     34\fB\-\-play-pause\fR 
     35If playing, playback is paused. Otherwise the player is started. 
     36.TP 
     37\fB\-\-prev\fR 
     38Move to previous track. 
     39.TP 
     40\fB\-\-next\fR 
     41Move to next track. 
     42.TP 
     43\fB\-\-toggle-mute\fR 
     44Mute or unmute depending on the current state. 
     45.TP 
     46\fB\-\-vol-up\fR=N 
     47Increase the volume by N% (0.0 <= n <= 1.0) 
     48.TP 
     49\fB\-\-vol-down\fR=N 
     50Decrease the volume by N% (0.0 <= n <= 1.0) 
     51.TP 
     52\fB\-\-get-state\fR 
     53Returns the current state of the audio player (stopped, playing, paused). 
     54.TP 
     55\fB\-\-get-current-uri\fR 
     56Returns the URI of the current audio source. 
     57.TP 
     58\fB\-\-get-current-title\fR 
     59Returns the title of the current audio source. 
     60.TP 
     61\fB\-\-get-current-artist\fR 
     62Returns the artist of the current audio source. 
     63.TP 
     64\fB\-\-get-current-album\fR 
     65Returns the album name of the current audio source. 
     66.TP 
     67\fB\-\-get-current-year\fR 
     68Returns the year of the current audio source. 
     69.TP 
     70\fB\-\-get-current-length\fR 
     71Returns the length (in seconds) of the current audio source. 
     72.TP 
     73\fB\-\-list-playlists\fR 
     74List all playlists. 
     75.TP 
     76\fB\-\-get-active-playlist\fR 
     77List the name of the active PlaylistControl.  This value may be empty if no 
     78playlists are active (e.g. a CDROM is active). 
     79.TP 
     80\fB\-\-set-active-playlist\fR=NAME 
     81Set the active playlist. 
     82.TP 
     83\fB\-\-enqueue\fR=URI 
     84Enqueue URI to the active playlist. 
     85 
     86.SH "ADVANCED OPTIONS" 
     87.TP 
     88\fB-l \fRLEVEL, \fB\-\-log-level\fR=LEVEL 
    2589Run with a specific logging level: CRITICAL, ERROR, WARNING, INFO, VERBOSE, or 
    2690DEBUG.  The default log level is INFO.  Level names are case insensitive. 
    27  
    28 .SH "ADVANCED OPTIONS" 
    2991\fB\-\-debug\fR 
    3092Break in python debugger on unhandled exceptions. 
    …… 
    40102 
    41103.SH AUTHOR 
    42 Mesk and its manpage written by Travis Shirk <travis@pobox.com>. 
     104Mesk is written by Travis Shirk <travis@pobox.com>. 

  • trunk/src/main.py

    r553 r554  
    250250        # Remote control options 
    251251        rc_opts = optparse.OptionGroup(self, _('Remote Control Options')) 
    252         rc_opts.set_description(_('These options operate on a running Mesk ' 
    253                                   'instance (starting Mesk if necessary). ' 
    254                                   'Which instance is determined ' 
    255                                   'by the profile option (-p,--profile).')) 
     252        rc_opts.set_description( 
     253            _('The remote control options operate on a running instance of ' 
     254              'Mesk, starting the app if necessary. If multiples instances of ' 
     255              'Mesk are running the profile option can be used to determine ' 
     256              'which instance to pass the command.')) 
    256257        rc_opts.add_option('--stop', action='callback', 
    257258                           callback=self._remote_option_cb, 
    258                            help=_('Stops playback')) 
     259                           help=_('Stop playback')) 
    259260        rc_opts.add_option('--play', action='callback', 
    260261                           callback=self._remote_option_cb, 
    261                            help=_('Starts playback')) 
     262                           help=_('Start playback')) 
    262263        rc_opts.add_option('--pause', action='callback', 
    263264                           callback=self._remote_option_cb, 
    264                            help=_('Pauses playback')) 
     265                           help=_('Pause playback')) 
    265266        rc_opts.add_option('--play-pause', action='callback', 
    266267                           callback=self._remote_option_cb, 
    267                            help=_('Pauses playback if currently playing, ' 
    268                                   'otherwise playback is started.')) 
     268                           help=_('If playing, playback is paused. Otherwise ' 
     269                                  'the player is started.')) 
    269270        rc_opts.add_option('--prev', action='callback', 
    270271                           callback=self._remote_option_cb,