[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeaddons/noatun-plugins/lyrics
From:       Charles Samuels <charles () kde ! org>
Date:       2003-02-01 4:58:19
[Download RAW message or body]

CVS commit by charles: 


A little code cleanup
Eliminate a few warnings
Add Chip Norkus's I'm Feeling Lucky (Google) search
method.

Unfortunately, if you already have Lyric's config in your noatunrc, you won't notice \
the change.  I'll leave that for Ismael to fix.

CCMAIL:Ismael Orenstein <ismore@ieg.com.br>
CCMAIL:Chip Norkus <wd@arpa.com>


  M +25 -4     cmodule.cpp   1.9
  M +1 -1      lyrics.cpp   1.26


--- kdeaddons/noatun-plugins/lyrics/cmodule.cpp  #1.8:1.9
@@ -16,6 +16,27 @@
 extern Lyrics *lyrics;
 
-#define DEFAULT_NAME "SongMeanings,Google,Lyrics Planet,Lyrics World,Get \
                Lyrics,AZLyrics,Astraweb,Everything2,Everything2 (author info)"
-#define DEFAULT_QUERY \
"http://www.songmeanings.net/search.php?type=titles&query=$(title),http://www.google.c \
om/search?q=lyrics+$(title)+$(author)+$(album),http://www.lyricsplanet.com/index.php3? \
style=searchtitle&fix=1&searchstring=$(title),http://www.lyricsworld.com/cgi-bin/searc \
h.cgi?q=$(title)+$(author),http://www.getlyrics.com/search.php?Song=$(title),http://ww \
w.azlyrics.com/cgi-bin/s.cgi?q=$(title)+$(author),http://search.lyrics.astraweb.com?wo \
rd=$(title)+$(author)+$(album),http://everything2.com/index.pl?node=$(title),http://everything2.com/index.pl?node=$(author)"
 +const char *const DEFAULT_NAME =
+  "SongMeanings,"
+  "Google,"
+  "Google (Feeling Lucky),"
+  "Lyrics Planet,"
+  "Lyrics World,"
+  "Get Lyrics,"
+  "AZLyrics,"
+  "Astraweb,"
+  "Everything2,"
+  "Everything2 (author info)";
+
+const char *const DEFAULT_QUERY =
+  "http://www.songmeanings.net/search.php?type=titles&query=$(title),"
+  "http://www.google.com/search?q=lyrics+$(title)+$(author)+$(album),"
+  "http://www.google.com/search?q=lyrics+%22$(title)%22+%22$(author)%22+%22$(album)%22&btnI=I%27m+Feeling+Lucky,"
 +  "http://www.lyricsplanet.com/index.php3?style=searchtitle&fix=1&searchstring=$(title),"
 +  "http://www.lyricsworld.com/cgi-bin/search.cgi?q=$(title)+$(author),"
+  "http://www.getlyrics.com/search.php?Song=$(title),"
+  "http://www.azlyrics.com/cgi-bin/s.cgi?q=$(title)+$(author),"
+  "http://search.lyrics.astraweb.com?word=$(title)+$(author)+$(album),"
+  "http://everything2.com/index.pl?node=$(title),"
+  "http://everything2.com/index.pl?node=$(author)";
 
 LyricsCModule::LyricsCModule(QObject *_parent) : CModule(i18n("Lyrics"), \
i18n("Configure Lyrics Plugin"), "document", _parent) { @@ -44,7 +65,7 @@ \
LyricsCModule::LyricsCModule(QObject *_p  QGrid *editGrid = new QGrid(2, propBox );
   editGrid->setSpacing(  propBox->insideSpacing() );
-  QLabel *nameLabel = new QLabel( i18n( "Name:" ), editGrid );
+  new QLabel( i18n( "Name:" ), editGrid );
   nameEdit = new KLineEdit( editGrid );
-  QLabel *queryLabel = new QLabel( i18n( "Query:" ), editGrid );
+  new QLabel( i18n( "Query:" ), editGrid );
   queryEdit = new KLineEdit( editGrid );
   /* ATTENTION to translators:

--- kdeaddons/noatun-plugins/lyrics/lyrics.cpp  #1.25:1.26
@@ -74,5 +74,5 @@ Lyrics::Lyrics() : KMainWindow(), Plugin
   follow_act->setChecked(config->readBoolEntry("follow", true));
   /* Create config object */
-  LyricsCModule *cmod = new LyricsCModule(this);
+  new LyricsCModule(this);
   
 }


[prev in list] [next in list] [prev in thread] [next in thread]