dmenu/LICENSE dmenu/Makefile dmenu/README dmenu/config.mk dmenu/dmenu.1 dmenu/dmenu.h dmenu/dmenu_path dmenu/draw.c dmenu/main.c dmenu/util.c dwm/LICENSE dwm/Makefile dwm/README dwm/config.h dwm/config.mk dwm/dwm.1 dwm/dwm.c sic/LICENSE sic/Makefile sic/README sic/config.mk sic/sic.1 sic/sic.c @@ -94,7 +94,7 @@ void MainWindowImpl::about() { QMessageBox::about(this, tr("About MIM"), tr("<b>Work in progress.</b><br>Moving from MSAccess to Qt.<br>Pre-release 1.1197759106<br><br><a href=\"http://mim.singpolyma.net/\">Project Website</a><br><a href=\"mailto:mim@singpolyma.net\">Email</a><br><br>Some icons from the <a href=\"http://famfamfam.com/lab/icons/silk/\">Silk icon set</a>")); }//end about -void importFinish(QStringList map, void* mainwindow, QSqlDatabase db) { +void importFinish(QStringList map, QWidget* mainwindow, QSqlDatabase db) { MainWindowImpl* mw = (MainWindowImpl*)mainwindow; QSqlTableModel* addressTable = mw->getAddressTable(); QSqlQuery query(db); @@ -144,5 +144,5 @@ void MainWindowImpl::import(QString fileName) { return; }//end if ! query.exec query.next(); - (new SqlImportWindow(((SxWResult*)(query.result()))->record(),addressTable->record(0),&importFinish,(void*)this,db))->show(); + (new SqlImportWindow(this,((SxWResult*)(query.result()))->record(),addressTable->record(0),&importFinish,db))->show(); }//end import(fileName) MIM/mainwindowimpl.cpp @@ -128,6 +128,7 @@ public: currencyTable->select(); enterEvent(new QEvent(QEvent::None)); + showEvent(new QEvent(QEvent::None)); connect(viewAddressesButton, SIGNAL(clicked()), this, SLOT(viewAddressesWindow())); connect(addAddressButton, SIGNAL(clicked()), this, SLOT(addAddresses())); MIM/mainwindowimpl.h @@ -34,13 +34,13 @@ class SqlImportWindow : public QWidget Q_OBJECT public: - SqlImportWindow(QSqlRecord from, QSqlRecord to, void(* importFinish)(QStringList,void*,QSqlDatabase), void* mw, QSqlDatabase db) : QWidget() { + SqlImportWindow(QWidget *parent, QSqlRecord from, QSqlRecord to, void(* importFinish)(QStringList,QWidget*,QSqlDatabase), QSqlDatabase db) : QWidget() { //from and to are records so that we can extract field names for mapping -- we don't do any actual importing here, just map the fields across this->from = from; this->importFinish = *importFinish; - this->mw = mw; + this->mw = parent; this->db = db; QComboBox *combo_tmp; @@ -82,8 +82,8 @@ public slots: protected: QSqlRecord from; - void (*importFinish)(QStringList, void*, QSqlDatabase); - void* mw; + void (*importFinish)(QStringList, QWidget*, QSqlDatabase); + QWidget* mw; QSqlDatabase db; }; MIM/sqlimportwindow.h 56c21f89ddbbe6e97d8e5e92ef6232972e32df8b Stephen Paul Weber singpolyma@singpolyma.net http://github.com/singpolyma/singpolyma/commit/36f8305ada38b542bf980ecd7b2ab7db6badb395 36f8305ada38b542bf980ecd7b2ab7db6badb395 2007-12-16T21:49:47-08:00 2007-12-16T21:49:47-08:00 Added my hacked versions of dwm (config), sic, and dmenu bb8e835bed7fa2ada497a55f0a86623f33be3265 Stephen Paul Weber singpolyma@singpolyma.net