summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2005-08-24 20:22:10 (UTC)
committer llornkcor <llornkcor>2005-08-24 20:22:10 (UTC)
commit65edeafe2dc8689dce7c2ce94e954933b393dcf0 (patch) (side-by-side diff)
tree17d0986ef0bce73f44a4b9900466fcc533954814
parentf0bb6c410f19d502cf563254d95158617a32b94e (diff)
downloadopie-65edeafe2dc8689dce7c2ce94e954933b393dcf0.zip
opie-65edeafe2dc8689dce7c2ce94e954933b393dcf0.tar.gz
opie-65edeafe2dc8689dce7c2ce94e954933b393dcf0.tar.bz2
optimize search. fix other things
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialog.cpp265
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialog.h15
-rw-r--r--noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp90
3 files changed, 170 insertions, 200 deletions
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
index 58babe9..9858188 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.cpp
@@ -115,104 +115,125 @@ void LibraryDialog::Newlibrary()
file = indexLine.mid( indexLine.find( "[", 0, true )+1, 12 );
number = indexLine.mid( indexLine.find( "]", 0, true ) +1, indexLine.find( " ", 0, true )+1 );
if( year.toInt() < 1984)
number = number.left( number.length() -1 );
title = indexLine.mid( indexLine.find(" ", 26, true), indexLine.length() );
addItems();
}// end if
}// end while
newindexLib.close();
}
#ifndef Q_WS_QWS
setCursor( arrowCursor);
#endif
#endif
} // end Newlibrary()
void LibraryDialog::Library() {
clearItems();
// qDebug( "opening GUTINDEX.ALL file");
IDontKnowWhy = "";
- if ( indexLib.open( IO_ReadOnly) ) { // file opened successfully
+ system("date");
+ if ( indexLib.open( IO_ReadOnly) ) {
+// file opened successfully
QTextStream indexStream( &indexLib );
QString indexLine;
qApp->processEvents();
-
+
+ bool okToRead = false;
while ( !indexStream.eof() ) {
-
indexLine = indexStream.readLine();
- if ( indexLine != "") {
-
- if( (indexLine.mid(4,4)).toInt() ) {
-
- year = indexLine.mid(4,4);
- file = indexLine.mid(60,12);
- if(file.left(1).find("[",0,TRUE) != -1)
- file.remove(1,1);
- if( file.find("]",0,TRUE) != -1)
- file = file.left( file.find("]",0,TRUE));
-
- if(file.find("?", 0, false) != -1 ) {
- QString tmpfile = file.replace(QRegExp("[?]"), "8");
- file = tmpfile;
- }
-
- number = indexLine.mid(55,5);
- title = indexLine.mid( 9, 50 );
-
- addItems();
-
- }
- else if ( indexLine.mid(73,5).toInt() && indexLine.mid(73,5).toInt() > 10000 ) {
-// newer files with numbers > 100000 have new dir structure and need to be parsed differently..
- number = indexLine.mid(73,5);
- int num = number.toInt();
- if(num < 10626)
- year = "2003";
- else if(num >= 10626 && num < 14600)
- year = "2004";
- else if(num >= 14600)
- year = "2005";
-
- file = number;// + ".txt";
- title = indexLine.mid(0,72);
-
- addItems();
- // qDebug("file number is " + number + " title is " + title );
- }
+ if(indexLine == "<==Start GUTINDEX.ALL listings==>")
+ okToRead = true;
+ if(indexLine == "<==End of GUTINDEX.ALL==>") {
+ okToRead = false;
+ indexLib.at(indexLib.size());
}
+
+ if(okToRead) {
+ QStringList token = QStringList::split(' ', indexLine);
+ int textNumber;
+ if(( textNumber = token.last().toInt() ))
+ if(textNumber > 10001) {
+// qWarning("Last "+token.last());
+// newer files with numbers > 100000 have new dir structure and need to be parsed differently..
+ if(textNumber < 10626)
+ year = "2003";
+ else if(textNumber >= 10626 && textNumber < 14600)
+ year = "2004";
+ else if(textNumber >= 14600)
+ year = "2005";
+
+ file = token.last();
+ title = indexLine.mid(0,72);
+
+ addItems(); //author and qlistview
+ // qDebug("file number is " + number + " title is " + title );
+
+ } else { //end new etexts
+
+ if(token[1].toInt() && token[1].toInt() > 1969) {
+ year = token[1];
+ file = indexLine.mid(60,12);
+
+ if(file.left(1).find("[",0,TRUE) != -1) {
+ file.remove(1,1);
+ if( file.find("]",0,TRUE) != -1)
+ file = file.left( file.find("]",0,TRUE));
+
+ if(file.find("?", 0, false) != -1 ) {
+ QString tmpfile = file.replace(QRegExp("[?]"), "8");
+ file = tmpfile;
+ }
+ title = indexLine.mid( 9, 50);
+
+ addItems();
+ }
+ } else { // then try new format texts
+ file = token.last();
+ title = indexLine.mid(0,72);
+ year = "1980";
+
+ addItems(); //author and qlistview
+ }
+ } //end old etexts
+
+ } //end okToTRead
}
indexLib.close();
} else {
QString sMsg;
sMsg = ( tr("<p>Error opening library index file. Please download a new one.</P> "));
QMessageBox::message( "Error",sMsg);
}
+ system("date");
+ sortLists(0);
+
} //end Library()
/*
Groks the author out of the title */
bool LibraryDialog::getAuthor()
{
if( title.contains( ", by", true)) {
int auth;
auth = title.find(", by", 0, true);
author = title.right(title.length() - (auth + 4) );
if( int finder = author.find("[", 0, true)) {
author = author.left(finder);
}
}
else if ( title.contains( "by, ", true) ) {
int auth;
auth = title.find("by, ", 0, true);
author = title.right(title.length() - (auth + 4) );
if( int finder = author.find("[", 0, true)) {
author = author.left( finder);
}
}
else if ( title.contains( " by", true) ) {
@@ -282,75 +303,82 @@ bool LibraryDialog::getAuthor()
int auth;
auth = author.find("et al", 0, true);
author = author.left( auth );
}
QRegExp r = QRegExp("[0-9]", true, false);
if ( author.left(2).find( r) != -1 ) {
author = "";
}
author = author.stripWhiteSpace();
if (authBox->isChecked() == TRUE) { // this reverses the first name and last name of the author
QString lastName, firstName="";
int finder = author.findRev( ' ', -1, TRUE);
lastName = author.right( author.length()-finder);
firstName = author.left(finder);
lastName = lastName.stripWhiteSpace();
firstName = firstName.stripWhiteSpace();
if( lastName.find( firstName, 0, true) == -1) // this avoids dup names
author = lastName+", "+firstName;
}
return true;
}////// end getAuthor()
-void LibraryDialog::addItems() {
+void LibraryDialog::addItems()
+{
cleanStrings();
getAuthor(); // grok author
- if( !number.isEmpty()
- && (title.find( "reserved",0, FALSE) == -1)
+
+ etext etextStruct;
+ if( /*!number.isEmpty()
+ && */
+ (title.find( "reserved",0, FALSE) == -1)
&& (file.find( "]",0, true) == -1)
&&(title.find( "Audio",0, FALSE) == -1)) {
// qDebug("new item "+title);
// fill string list or something to be able to sort by Author
+ etextStruct.title = title;
+ etextStruct.author = author;
+ etextStruct.year = year;
+ etextStruct.file = file;
+
+ etextLibrary.append( etextStruct);
+
if( author.isEmpty() )
- QList_Item5 = new QListViewItem( ListView5, /*number, */title, author, year, file );
+ QList_Item5 = new QListViewItem( ListView5, /*number, */author, title, year, file );
else {
- if( (author.left(1) >= QString("A") && author.left(1) <= QString("F")) ||
- (author.left(1) >= QString("a") && author.left(1) <= QString("f")) )
- QList_Item1 = new QListViewItem( ListView1, /* number,*/ title, author, year, file );
+ if( author.find(QRegExp("[^a-fA-F]")) )
+ QList_Item1 = new QListViewItem( ListView1, /* number,*/author, title, year, file );
- else if( (author.left(1) >= QString("G") && author.left(1) <= QString("M")) ||
- (author.left(1) >= QString("g") && author.left(1) <= QString("m")) )
- QList_Item2 = new QListViewItem( ListView2, /* number,*/ title, author, year, file );
+ else if(author.find(QRegExp("[^g-mG-M]")) )
+ QList_Item2 = new QListViewItem( ListView2, /* number,*/ author, title,year, file );
- else if( (author.left(1) >= QString("N") && author.left(1) <= QString("R")) ||
- (author.left(1) >= QString("n") && author.left(1) <= QString("r")) )
- QList_Item3 = new QListViewItem( ListView3, /* number,*/ title, author, year, file );
+ else if(author.find(QRegExp("[^n-rN-R]")) )
+ QList_Item3 = new QListViewItem( ListView3, /* number,*/ author, title, year, file );
- else if( (author.left(1) >= QString("S") && author.left(1) <= QString("Z")) ||
- (author.left(1) >= QString("s") && author.left(1) <= QString("z")) )
- QList_Item4 = new QListViewItem( ListView4, /* number,*/ title, author, year, file );
+ else if(author.find(QRegExp("[^s-zS-Z]")) )
+ QList_Item4 = new QListViewItem( ListView4, /* number,*/ author, title, year, file );
}
}
}
/*
selected one etext*/
void LibraryDialog::select_title( QListViewItem * item)
{
if(item != NULL) {
i++;
int index = tabWidget->currentPageIndex();
DlglistItemTitle = item->text(0);
DlglistItemYear = item->text(2);
DlglistItemFile = item->text(3);
switch (index) {
case 0: {
ListView1->clearSelection();
}
break;
case 1: {
ListView2->clearSelection();
}
break;
@@ -654,205 +682,154 @@ void LibraryDialog::saveConfig()
searches library index for user word*/
void LibraryDialog::onButtonSearch()
{
ListView1->clearSelection();
ListView2->clearSelection();
ListView3->clearSelection();
ListView4->clearSelection();
ListView5->clearSelection();
int curTab = tabWidget->currentPageIndex();
SearchDialog* searchDlg;
// if( resultsList)
searchDlg = new SearchDialog( this, "Library Search", true);
searchDlg->setCaption( tr( "Library Search" ) );
searchDlg->setLabel( "- author or title");
QString resultString;
int i_berger = 0;
if( searchDlg->exec() != 0 ) {
QString searcherStr = searchDlg->get_text();
int fluff = 0;
- // int tabPage = tabWidget->currentPageIndex();
- // TODO ititerate here... struct<listViews>??
-
- QListViewItemIterator it1( ListView1 );
- QListViewItemIterator it2( ListView2 );
- QListViewItemIterator it3( ListView3 );
- QListViewItemIterator it4( ListView4 );
- QListViewItemIterator it5( ListView5 );
-
- //// this is really pitiful work,
- ///////
bool cS;
if( searchDlg->caseSensitiveCheckBox->isChecked())
- cS=true; //case sensitive
+ cS = true; //case sensitive
else
- cS=false;
-
- if(fluff==0) {
- for ( ; it1.current(); ++it1 ) {
- resultString = ( it1.current() )->text(0);
- resultString += (" : ");
- resultString += ( it1.current() )->text(2);
- resultString += (" : ");
- resultString += ( it1.current() )->text(3);
- if( resultString.find( searcherStr, 0, cS) != -1)
- {
- Searchlist.append( resultString);
- }
- }
- }
- if(fluff==0) {// search routine here
- for ( ; it2.current(); ++it2 ) {
- resultString = ( it2.current() )->text(0);
- resultString += (" : ");
- resultString += ( it2.current() )->text(2);
- resultString += (" : ");
- resultString += ( it2.current() )->text(3);
- if( resultString.find( searcherStr, 0, cS) != -1) {
- Searchlist.append( resultString);
- }
- }
- }
- if(fluff==0) {// search routine here
- for ( ; it3.current(); ++it3 ) {
- resultString = ( it3.current() )->text(0);
- resultString += (" : ");
- resultString += ( it3.current() )->text(2);
- resultString += (" : ");
- resultString += ( it3.current() )->text(3);
-
- if( resultString.find( searcherStr, 0, cS) != -1) {
- Searchlist.append( resultString);
- }
- }
- }
- if(fluff==0) {
- // search routine here
- for ( ; it4.current(); ++it4 ) {
- resultString = ( it4.current() )->text(0);
- resultString += (" : ");
- resultString += ( it4.current() )->text(2);
- resultString += (" : ");
- resultString += ( it4.current() )->text(3);
- if( resultString.find( searcherStr, 0, cS) != -1) {
- Searchlist.append( resultString);
- }
- }
- }
- if(fluff==0) { // search routine here
- for ( ; it5.current(); ++it5 ) {
- resultString = ( it5.current() )->text(0);
- resultString += (" : ");
- resultString += ( it5.current() )->text(2);
- resultString += (" : ");
- resultString += ( it5.current() )->text(3);
- if( resultString.find( searcherStr, 0, cS) != -1) {
- Searchlist.append( resultString);
- }
- }
- }
+ cS = false;
+
+ etext etextStruct;
+ QValueList<etext>::Iterator it;
+
+ for( it = etextLibrary.begin(); it != etextLibrary.end(); ++it ) {
+ QString tempTitle = (*it).title;
+ QString tempAuthor = (*it).author;
+ QString tempFile = (*it).file;
+ QString tempYear = (*it).year;
+ if(tempTitle.find( searcherStr, 0, cS) != -1
+ || tempAuthor.find( searcherStr, 0, cS) != -1) {
+ qWarning(tempTitle);
+ Searchlist.append( tempTitle + " : " + tempYear + " : " + tempFile);
+ }
+ }
+
tabWidget->setCurrentPage( curTab);
Searchlist.sort();
SearchResultsDlg* SearchResultsDialog;
SearchResultsDialog = new SearchResultsDlg( searchDlg, "Results Dialog", true, 0 , Searchlist);
SearchResultsDialog->showMaximized();
if( SearchResultsDialog->exec() != 0) {
texter = SearchResultsDialog->selText;
// //odebug << texter << oendl;
resultLs = SearchResultsDialog->resultsList;
i_berger = 1;
} else {
resultLs.clear();
}
Searchlist.clear();
- // if(SearchResultsDialog)
- // delete SearchResultsDialog;
QString tester;
for ( QStringList::Iterator it = resultLs.begin(); it != resultLs.end(); ++it ) {
texter.sprintf("%s \n",(*it).latin1());
// //odebug << texter << oendl;
if( tester!=texter)
parseSearchResults( texter);
tester = texter;
}
if(searchDlg)
delete searchDlg;
}
if(checkBox->isChecked() ) {
accept();
} else {
setActiveWindow();
}
}
/*
splits the result string and calls download for the current search result*/
void LibraryDialog::parseSearchResults( QString resultStr)
{
int stringLeng = resultStr.length();
QString my;
my.setNum( stringLeng, 10);
if( resultStr.length() > 2 && resultStr.length() < 130) {
int titleInt = resultStr.find( " : ", 0, true);
DlglistItemTitle = resultStr.left( titleInt);
int yearInt = resultStr.find( " : ", titleInt+3, true);
DlglistItemYear = resultStr.mid( titleInt+3, (yearInt - titleInt)-3);
DlglistItemFile = resultStr.right( resultStr.length() - (yearInt + 3));
DlglistItemFile = DlglistItemFile.left( DlglistItemFile.length() - 2);
cleanStrings();
if(DlglistItemFile.left(1) == "/")
DlglistItemFile = DlglistItemFile.right( DlglistItemFile.length() - 1);
- if( DlglistItemFile.toInt() > 10000 ) {
+ if( DlglistItemFile.toInt() > 10000 || yearInt == 1980 ) {
// new directory sturcture
download_newEtext(); //)
} else {
download_Etext(); //)
}
}
}
-void LibraryDialog::sort()
+void LibraryDialog::sortLists(int index)
{
-
+
+ ListView1->setSorting(index);
+ ListView2->setSorting(index);
+ ListView3->setSorting(index);
+ ListView4->setSorting(index);
+ ListView5->setSorting(index);
+ ListView1->sort();
+ ListView2->sort();
+ ListView3->sort();
+ ListView4->sort();
+ ListView5->sort();
}
/*
Downloads the current selected listitem*/
bool LibraryDialog::getItem(QListViewItem *it)
{
// //odebug << "selected getItem" << oendl;
// DlglistItemNumber = it->text(0);
DlglistItemTitle = it->text(0);
DlglistItemYear = it->text(2);
DlglistItemFile = it->text(3);
if(download_Etext()) {
if(i_binary == 1) {
}
}
return true;
}
/*
download button is pushed so we get the current items to download*/
bool LibraryDialog::onButtonDownload()
{
@@ -1029,41 +1006,47 @@ bool LibraryDialog::moreInfo()
} else
QMessageBox::message( "Note","<p>If you select a title, this will search google.com for that title.</p>");
return true;
}
/*
This loads the library Index*/
void LibraryDialog::FindLibrary()
{
buttonLibrary->setDown(true);
qApp->processEvents();
if( QFile( new_index).exists() /* && this->isHidden() */) {
newindexLib.setName( new_index);
indexLib.setName( new_index);
//odebug << "index file is "+ new_index << oendl;
Newlibrary();
} else {
newindexLib.setName( old_index);
indexLib.setName( old_index);
//odebug << "new index nameis "+ old_index << oendl;
Library();
}
- indexLoaded=true;
+ indexLoaded =true;
buttonSearch->setEnabled(true);
moreInfoButton->setEnabled(true);
buttonLibrary->setDown(false);
buttonNewList->setText("Download");
qApp->processEvents();
}
void LibraryDialog::cleanStrings() {
year = year.stripWhiteSpace();
file = file.stripWhiteSpace();
title = title.stripWhiteSpace();
number = number.stripWhiteSpace();
}
+
+void LibraryDialog::authBoxClicked()
+{
+ qApp->processEvents();
+ FindLibrary();
+}
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialog.h b/noncore/apps/opie-gutenbrowser/LibraryDialog.h
index 8d6352f..95226b2 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialog.h
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialog.h
@@ -9,59 +9,68 @@
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
#ifndef LIBRARYDIALOG_H
#define LIBRARYDIALOG_H
#include <qpe/config.h>
#include "SearchDialog.h"
#include "NetworkDialog.h"
#include <qstringlist.h>
#include <qdialog.h>
#include <qcheckbox.h>
#include <qdatetime.h>
#include <qfile.h>
#include <qheader.h>
#include <qlistview.h>
#include <qmessagebox.h>
#include <qregexp.h>
#include <qstring.h>
#include <qtextstream.h>
#include <qlabel.h>
#include <stdlib.h>
#include <qtabwidget.h>
+#include <qvaluelist.h>
class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;
class QListView;
class QListViewItem;
class QPushButton;
//class QTabWidget;
class QWidget;
//class Gutenbrowser;
+typedef struct {
+ QString title;
+ QString author;
+ QString year;
+ QString file;
+} etext;
+
+
class LibraryDialog : public QDialog {
Q_OBJECT
public:
LibraryDialog( QWidget* parent = 0, const char* name = 0 , bool modal = TRUE, WFlags fl = 0 );
~LibraryDialog();
QTabWidget *tabWidget;
QListView *ListView1,*ListView2,*ListView3,*ListView4,*ListView5;
QWidget *widget_1,*widget_2,*widget_3,*widget_4,*widget_5,*widget_6;
QString ftp_host,ftp_base_dir;
QLabel *statusLabel;
QListViewItem *QList_Item1,*QList_Item2,*QList_Item3,*QList_Item4,*QList_Item5;
QStringList list,ItemStrlist,Searchlist,resultLs;
// QStringList list1,list2,list3,list4;
QPushButton *buttonSearch,*buttonCancel,*buttonDownload,*buttonLibrary,*buttonNewList,*moreInfoButton;
QString new_index,old_index;
QFile newindexLib,indexLib;
int checked;
int i_binary;
bool useSmallInterface;
bool indexLoaded;
@@ -78,56 +87,60 @@ bool indexLoaded;
QString m_getFilePath;
QString Edir;
QString index;
QString IDontKnowWhy;
QString local_library;
QString local_index;
QString File_Name;
QString proxy_http;
int doitAll;
QString texter;
// CConfigFile *config;
void parseSearchResults( QString resultStr);
public slots:
bool getItem(QListViewItem* );
void doListView();
void FindLibrary();
void newList();
void Newlibrary();
void Library();
bool getAuthor();
void select_title(QListViewItem*);
void cancelIt();
- void sort();
+ void sortLists(int);
bool moreInfo();
// void DownloadEmAll();
bool httpDownload();
bool setTitle();
void saveConfig();
bool download_Etext();
bool download_newEtext();
void onButtonSearch();
bool onButtonDownload();
// bool UnzipIt( QString fileName);
void comboSelect(int index);
protected slots:
protected:
+ QValueList<etext> etextLibrary;
+
void initDialog();
QHBoxLayout *hbox,*hbox1,*hbox2;
QVBoxLayout *vbox;
// void search_slot();
private:
void addItems();
void clearItems();
void cleanStrings();
bool getEtext(const QStringList &);
+private slots:
+ void authBoxClicked();
};
#endif // LIBRARYDIALOG_H
diff --git a/noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp b/noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp
index 60c1c75..bfbf84d 100644
--- a/noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp
+++ b/noncore/apps/opie-gutenbrowser/LibraryDialogData.cpp
@@ -51,185 +51,158 @@ void LibraryDialog::initDialog(){
tabWidget = new QTabWidget( this, "tabWidget" );
layout->addMultiCellWidget( tabWidget, 0, 0, 0, 3);
widget_1 = new QWidget( tabWidget, "widget" );
ListView1 = new QListView( widget_1, "ListView1" );
QGridLayout *layout1 = new QGridLayout(widget_1 );
widget_2 = new QWidget( tabWidget, "widget_2" );
ListView2 = new QListView( widget_2, "ListView2" );
QGridLayout *layout2 = new QGridLayout(widget_2 );
widget_3 = new QWidget( tabWidget, "widget_3" );
ListView3 = new QListView( widget_3, "ListView3" );
QGridLayout *layout3 = new QGridLayout(widget_3 );
widget_4 = new QWidget( tabWidget, "widget_4" );
ListView4 = new QListView( widget_4, "ListView4" );
QGridLayout *layout4 = new QGridLayout(widget_4 );
widget_5 = new QWidget( tabWidget, "widget_5" );
ListView5 = new QListView( widget_5, "ListView5" );
QGridLayout *layout5 = new QGridLayout(widget_5 );
- ListView1->addColumn( tr( "Title" ) );
- ListView1->setColumnWidthMode( 0, QListView::Manual );
- ListView1->setColumnWidth(0, 330);
+ ListView1->addColumn( tr( "Author" ), -1 );
+ ListView1->setColumnAlignment( 1, 1 );
+
+ ListView1->addColumn( tr( "Title" ), -1 );
ListView1->setColumnAlignment( 0, 1 );
- ListView1->addColumn( tr( "Author" ) );
- ListView1->setColumnWidthMode( 1, QListView::Manual );
- ListView1->setColumnWidth(1, 170);
- ListView1->setColumnAlignment( 1, 1 );
ListView1->addColumn( tr( "Year" ) );
ListView1->setColumnWidthMode( 2, QListView::Manual );
- ListView1->setColumnWidth(2, 50);
ListView1->setColumnAlignment( 2, 1 );
- ListView1->addColumn( tr( "File" ) );
+ ListView1->addColumn( tr( "File" ), -1 );
ListView1->setColumnWidthMode( 2, QListView::Manual );
- ListView1->setColumnWidth(2, 100);
- ListView1->setColumnAlignment( 2, 1 );
- ListView2->addColumn( tr( "Title" ) );
- ListView2->setColumnWidthMode( 0, QListView::Manual );
- ListView2->setColumnWidth(0, 330);
- ListView2->setColumnAlignment( 0, 1 );
+ ListView1->setColumnAlignment( 2, 1 );
- ListView2->addColumn( tr( "Author" ) );
- ListView2->setColumnWidthMode( 1, QListView::Manual );
- ListView2->setColumnWidth(1, 170);
+ ListView2->addColumn( tr( "Author" ), -1 );
ListView2->setColumnAlignment( 1, 1 );
- ListView2->addColumn( tr( "Year" ) );
+ ListView2->addColumn( tr( "Title" ), -1);
+ ListView2->setColumnAlignment( 0, 1 );
+
+ ListView2->addColumn( tr( "Year" ), -1 );
ListView2->setColumnWidthMode( 2, QListView::Manual );
- ListView2->setColumnWidth(2, 50);
ListView2->setColumnAlignment( 2, 1 );
- ListView2->addColumn( tr( "File" ) );
+ ListView2->addColumn( tr( "File" ), -1 );
ListView2->setColumnWidthMode( 3, QListView::Manual );
- ListView2->setColumnWidth(3, 100);
ListView2->setColumnAlignment( 3, 1 );
- ListView3->addColumn( tr( "Title" ) );
- ListView3->setColumnWidthMode( 0, QListView::Manual );
- ListView3->setColumnWidth(0, 330);
+ ListView3->addColumn( tr( "Author" ), -1 );
+ ListView3->setColumnAlignment( 1, 1 );
+
+ ListView3->addColumn( tr( "Title" ), -1 );
ListView3->setColumnAlignment( 0, 1 );
- ListView3->addColumn( tr( "Author" ) );
- ListView3->setColumnWidthMode( 1, QListView::Manual );
- ListView3->setColumnWidth(1, 170);
- ListView3->setColumnAlignment( 1, 1 );
- ListView3->addColumn( tr( "Year" ) );
+ ListView3->addColumn( tr( "Year" ), -1 );
ListView3->setColumnWidthMode( 2, QListView::Manual );
- ListView3->setColumnWidth(2, 50);
ListView3->setColumnAlignment( 2, 1 );
- ListView3->addColumn( tr( "File" ) );
+ ListView3->addColumn( tr( "File" ), -1 );
ListView3->setColumnWidthMode( 3, QListView::Manual );
- ListView3->setColumnWidth(3, 100);
ListView3->setColumnAlignment( 3, 1 );
- ListView4->addColumn( tr( "Title" ) );
- ListView4->setColumnWidthMode( 0, QListView::Manual );
- ListView4->setColumnWidth(0, 330);
- ListView4->setColumnAlignment( 0, 1 );
-
- ListView4->addColumn( tr( "Author" ) );
- ListView4->setColumnWidthMode( 1, QListView::Manual );
- ListView4->setColumnWidth(1, 170);
+ ListView4->addColumn( tr( "Author" ), -1 );
ListView4->setColumnAlignment( 1, 1 );
+ ListView4->addColumn( tr( "Title" ), -1 );
+ ListView4->setColumnAlignment( 0, 1 );
- ListView4->addColumn( tr( "Year" ) );
+ ListView4->addColumn( tr( "Year" ), -1 );
ListView4->setColumnWidthMode( 2, QListView::Manual );
- ListView4->setColumnWidth(2, 50);
ListView4->setColumnAlignment( 2, 1 );
- ListView4->addColumn( tr( "File" ) );
+ ListView4->addColumn( tr( "File" ), -1 );
ListView4->setColumnWidthMode( 3, QListView::Manual );
- ListView4->setColumnWidth(3, 100);
ListView4->setColumnAlignment( 3, 1 );
- ListView5->addColumn( tr( "Title" ) );
- ListView5->setColumnWidthMode( 0, QListView::Manual );
- ListView5->setColumnWidth(0, 330);
+ ListView5->addColumn( tr( "Author" ), -1 );
+ ListView5->setColumnAlignment( 1, 1 );
+
+ ListView5->addColumn( tr( "Title" ), -1 );
ListView5->setColumnAlignment( 0, 1 );
- ListView5->addColumn( tr( "Author" ) );
- ListView5->setColumnWidthMode( 1, QListView::Manual );
- ListView5->setColumnWidth(1, 170);
- ListView5->setColumnAlignment( 1, 1 );
- ListView5->addColumn( tr( "Year" ) );
+ ListView5->addColumn( tr( "Year" ), -1 );
ListView5->setColumnWidthMode( 2, QListView::Manual );
- ListView5->setColumnWidth(2, 50);
ListView5->setColumnAlignment( 2, 1 );
- ListView5->addColumn( tr( "File" ) );
+ ListView5->addColumn( tr( "File" ), -1 );
ListView5->setColumnWidthMode( 3, QListView::Manual );
- ListView5->setColumnWidth(3, 100);
ListView5->setColumnAlignment( 3, 1 );
tabWidget->insertTab( widget_1, tr( "A-F" ) );
tabWidget->insertTab( widget_2, tr( "G-M" ) );
tabWidget->insertTab( widget_3, tr( "N-R" ) );
tabWidget->insertTab( widget_4, tr( "S-Z" ) );
tabWidget->insertTab( widget_5, tr( " " ) );
ListView1->setMultiSelection(TRUE);
ListView2->setMultiSelection(TRUE);
ListView3->setMultiSelection(TRUE);
ListView4->setMultiSelection(TRUE);
ListView5->setMultiSelection(TRUE);
widget_6 = new QWidget( tabWidget, "widget_6" );
tabWidget->insertTab(widget_6,tr("Options"));
ListView1->setSorting( 2, TRUE);
ListView2->setSorting( 2, TRUE);
ListView3->setSorting( 2, TRUE);
ListView4->setSorting( 2, TRUE);
ListView5->setSorting( 2, TRUE);
ListView1->setAllColumnsShowFocus( TRUE );
ListView2->setAllColumnsShowFocus( TRUE );
ListView3->setAllColumnsShowFocus( TRUE );
ListView4->setAllColumnsShowFocus( TRUE );
ListView5->setAllColumnsShowFocus( TRUE );
QGridLayout *layout6 = new QGridLayout(widget_6 );
QComboBox * sortingCombo;
buttonCancel = new QPushButton( widget_6, "buttonCancel" );
checkBox = new QCheckBox( ( tr("Open Automatically")), widget_6);
checkBox->setChecked( FALSE);
// httpBox = new QCheckBox( ( tr("Use http")),widget_6);
// httpBox->setChecked( FALSE);
// QToolTip::add( httpBox, ( tr("Use http to download \nproxy users should probably use this.")) );
- authBox= new QCheckBox( ( tr("Last name first \n(requires library restart)")),widget_6);
- authBox->setChecked( FALSE);
+ authBox= new QCheckBox( ( tr("Last name first.")),widget_6);
+ authBox->setChecked( true);
layout1->addMultiCellWidget( ListView1, 0, 0, 0, 4);
layout2->addMultiCellWidget( ListView2, 0, 0, 0, 4);
layout3->addMultiCellWidget( ListView3, 0, 0, 0, 4);
layout4->addMultiCellWidget( ListView4, 0, 0, 0, 4);
layout5->addMultiCellWidget( ListView5, 0, 0, 0, 4);
buttonSearch = new QPushButton(this,"buttonSearch");
buttonLibrary=new QPushButton(this,"buttenLibrary");
buttonNewList=new QPushButton(this,"NewList");
moreInfoButton= new QPushButton(this,"moreInfo");
sortingCombo=new QComboBox(widget_6,"sort by combo");
layout6->addMultiCellWidget(buttonCancel, 0, 0, 4, 4);
layout6->addMultiCellWidget(checkBox, 1, 1, 0, 0);
layout6->addMultiCellWidget(sortingCombo, 2, 2, 0, 0);
layout6->addMultiCellWidget(authBox, 3, 3, 0, 0);
layout->addMultiCellWidget( buttonSearch, 1, 1, 0, 0);
layout->addMultiCellWidget( buttonLibrary, 1, 1, 1, 1);
layout->addMultiCellWidget( moreInfoButton, 1, 1, 2, 2);
layout->addMultiCellWidget( buttonNewList, 1, 1, 3, 3);
@@ -251,32 +224,33 @@ void LibraryDialog::initDialog(){
sortingList.append( "Sort by Author");
sortingList.append("Sort by Year");
sortingCombo->insertStrList(sortingList,0);
sortingCombo->setCurrentItem(2);
sortingCombo->setMaximumWidth(180);
// signals and slots connections
connect(buttonSearch,SIGNAL(clicked()),this,SLOT(onButtonSearch()));
connect(buttonLibrary,SIGNAL(clicked()),this,SLOT(FindLibrary()));
connect(buttonCancel,SIGNAL(clicked()),this,SLOT(reject()));
connect(moreInfoButton,SIGNAL(clicked()),this,SLOT(moreInfo()));
connect(buttonNewList,SIGNAL(clicked()),this,SLOT(newList()));
connect(ListView1,SIGNAL(doubleClicked(QListViewItem*)),SLOT(select_title(QListViewItem*)));
connect(ListView1,SIGNAL(returnPressed(QListViewItem*)),SLOT(select_title(QListViewItem*)));
connect(ListView2,SIGNAL(doubleClicked(QListViewItem*)),SLOT(select_title(QListViewItem*)));
connect(ListView2,SIGNAL(returnPressed(QListViewItem*)),SLOT(select_title(QListViewItem*)));
connect(ListView3,SIGNAL(doubleClicked(QListViewItem*)),SLOT(select_title(QListViewItem*)));
connect(ListView3,SIGNAL(returnPressed(QListViewItem*)),SLOT(select_title(QListViewItem*)));
connect(ListView4,SIGNAL(doubleClicked(QListViewItem*)),SLOT(select_title(QListViewItem*)));
connect(ListView4,SIGNAL(returnPressed(QListViewItem*)),SLOT(select_title(QListViewItem*)));
connect(ListView5,SIGNAL(doubleClicked(QListViewItem*)),SLOT(select_title(QListViewItem*)));
connect(ListView5,SIGNAL(returnPressed(QListViewItem*)),SLOT(select_title(QListViewItem*)));
+ connect(authBox,SIGNAL(clicked()),this,SLOT(authBoxClicked()));
connect(sortingCombo,SIGNAL(activated(int)),SLOT(comboSelect(int)));
}
void LibraryDialog::doListView() {
}