projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
47f8eca
)
improvements to the default layout
author
Marcus Eggenberger
<egs@quassel-irc.org>
Wed, 27 Feb 2008 16:20:34 +0000
(16:20 +0000)
committer
Marcus Eggenberger
<egs@quassel-irc.org>
Wed, 27 Feb 2008 16:20:34 +0000
(16:20 +0000)
src/qtui/chatwidget.cpp
patch
|
blob
|
history
src/qtui/chatwidget.h
patch
|
blob
|
history
src/qtui/mainwin.cpp
patch
|
blob
|
history
src/qtui/nicklistwidget.cpp
patch
|
blob
|
history
src/qtui/nicklistwidget.h
patch
|
blob
|
history
src/uisupport/bufferview.cpp
patch
|
blob
|
history
src/uisupport/nickview.cpp
patch
|
blob
|
history
version.inc
patch
|
blob
|
history
diff --git
a/src/qtui/chatwidget.cpp
b/src/qtui/chatwidget.cpp
index
722f502
..
3a04383
100644
(file)
--- a/
src/qtui/chatwidget.cpp
+++ b/
src/qtui/chatwidget.cpp
@@
-85,6
+85,10
@@
QSize ChatWidget::minimumSizeHint() const {
return QSize(20, 20);
}
return QSize(20, 20);
}
+QSize ChatWidget::sizeHint() const {
+ return QSize(400, 100);
+}
+
// QSize ChatWidget::sizeHint() const {
// //qDebug() << size();
// return size();
// QSize ChatWidget::sizeHint() const {
// //qDebug() << size();
// return size();
diff --git
a/src/qtui/chatwidget.h
b/src/qtui/chatwidget.h
index
305af68
..
b8aa5a7
100644
(file)
--- a/
src/qtui/chatwidget.h
+++ b/
src/qtui/chatwidget.h
@@
-48,7
+48,7
@@
class ChatWidget : public QAbstractScrollArea {
void init(BufferId id);
virtual QSize minimumSizeHint() const;
void init(BufferId id);
virtual QSize minimumSizeHint() const;
-
//
virtual QSize sizeHint() const;
+ virtual QSize sizeHint() const;
public slots:
void clear();
public slots:
void clear();
diff --git
a/src/qtui/mainwin.cpp
b/src/qtui/mainwin.cpp
index
e88a86d
..
d700b64
100644
(file)
--- a/
src/qtui/mainwin.cpp
+++ b/
src/qtui/mainwin.cpp
@@
-70,7
+70,10
@@
MainWin::MainWin(QtUi *_gui, QWidget *parent)
void MainWin::init() {
QtUiSettings s;
void MainWin::init() {
QtUiSettings s;
- resize(s.value("MainWinSize").toSize());
+ if(s.value("MainWinSize").isValid())
+ resize(s.value("MainWinSize").toSize());
+ else
+ resize(QSize(800, 500));
Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
Client::signalProxy()->attachSignal(this, SIGNAL(requestBacklog(BufferInfo, QVariant, QVariant)));
@@
-94,9
+97,9
@@
void MainWin::init() {
setupMenus();
setupViews();
setupNickWidget();
setupMenus();
setupViews();
setupNickWidget();
+ setupTopicWidget();
setupChatMonitor();
setupInputWidget();
setupChatMonitor();
setupInputWidget();
- setupTopicWidget();
setupSystray();
setupSystray();
@@
-169,6
+172,7
@@
QDockWidget *MainWin::addBufferView(const QString &viewname, QAbstractItemModel
dock->show();
addDockWidget(Qt::LeftDockWidgetArea, dock);
dock->show();
addDockWidget(Qt::LeftDockWidgetArea, dock);
+
ui.menuViews->addAction(dock->toggleViewAction());
netViews.append(dock);
ui.menuViews->addAction(dock->toggleViewAction());
netViews.append(dock);
@@
-201,6
+205,7
@@
void MainWin::setupNickWidget() {
nickDock->setWidget(nickListWidget);
addDockWidget(Qt::RightDockWidgetArea, nickDock);
nickDock->setWidget(nickListWidget);
addDockWidget(Qt::RightDockWidgetArea, nickDock);
+
ui.menuViews->addAction(nickDock->toggleViewAction());
Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
ui.menuViews->addAction(nickDock->toggleViewAction());
Client::bufferModel()->mapProperty(0, NetworkModel::BufferIdRole, nickListWidget, "currentBuffer");
diff --git
a/src/qtui/nicklistwidget.cpp
b/src/qtui/nicklistwidget.cpp
index
04e6e22
..
8219172
100644
(file)
--- a/
src/qtui/nicklistwidget.cpp
+++ b/
src/qtui/nicklistwidget.cpp
@@
-75,3
+75,11
@@
void NickListWidget::removeBuffer(BufferId bufferId) {
ui.stackedWidget->removeWidget(view);
view->deleteLater();
}
ui.stackedWidget->removeWidget(view);
view->deleteLater();
}
+
+QSize NickListWidget::sizeHint() const {
+ QWidget *currentWidget = ui.stackedWidget->currentWidget();
+ if(!currentWidget || currentWidget == ui.emptyPage)
+ return QSize(100, height());
+ else
+ return currentWidget->sizeHint();
+}
diff --git
a/src/qtui/nicklistwidget.h
b/src/qtui/nicklistwidget.h
index
b21182d
..
a004f2a
100644
(file)
--- a/
src/qtui/nicklistwidget.h
+++ b/
src/qtui/nicklistwidget.h
@@
-41,7
+41,10
@@
public slots:
BufferId currentBuffer() const;
void setCurrentBuffer(BufferId bufferId);
void reset();
BufferId currentBuffer() const;
void setCurrentBuffer(BufferId bufferId);
void reset();
-
+
+protected:
+ virtual QSize sizeHint() const;
+
private slots:
void removeBuffer(BufferId bufferId);
private slots:
void removeBuffer(BufferId bufferId);
diff --git
a/src/uisupport/bufferview.cpp
b/src/uisupport/bufferview.cpp
index
3043b83
..
d83f696
100644
(file)
--- a/
src/uisupport/bufferview.cpp
+++ b/
src/uisupport/bufferview.cpp
@@
-136,9
+136,8
@@
void BufferView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bott
continue;
bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
continue;
bool isActive = networkIdx.data(NetworkModel::ItemActiveRole).toBool();
- if(isExpanded(networkIdx) != isActive)
{
+ if(isExpanded(networkIdx) != isActive)
setExpanded(networkIdx, isActive);
setExpanded(networkIdx, isActive);
- }
}
}
}
}
@@
-276,7
+275,10
@@
void BufferView::wheelEvent(QWheelEvent* event)
QSize BufferView::sizeHint() const {
if(!model())
return QTreeView::sizeHint();
QSize BufferView::sizeHint() const {
if(!model())
return QTreeView::sizeHint();
-
+
+ if(model()->rowCount() == 0)
+ return QSize(120, 50);
+
int columnSize = 0;
for(int i = 0; i < model()->columnCount(); i++) {
if(!isColumnHidden(i))
int columnSize = 0;
for(int i = 0; i < model()->columnCount(); i++) {
if(!isColumnHidden(i))
diff --git
a/src/uisupport/nickview.cpp
b/src/uisupport/nickview.cpp
index
ba96c1e
..
7e30cb7
100644
(file)
--- a/
src/uisupport/nickview.cpp
+++ b/
src/uisupport/nickview.cpp
@@
-146,11
+146,12
@@
void NickView::executeCommand(const BufferInfo & bufferInfo, const QString & com
QSize NickView::sizeHint() const {
if(!model())
return QTreeView::sizeHint();
QSize NickView::sizeHint() const {
if(!model())
return QTreeView::sizeHint();
-
+
int columnSize = 0;
for(int i = 0; i < model()->columnCount(); i++) {
if(!isColumnHidden(i))
columnSize += sizeHintForColumn(i);
}
int columnSize = 0;
for(int i = 0; i < model()->columnCount(); i++) {
if(!isColumnHidden(i))
columnSize += sizeHintForColumn(i);
}
+
return QSize(columnSize, 50);
}
return QSize(columnSize, 50);
}
diff --git
a/version.inc
b/version.inc
index
c957677
..
1e0e8b0
100644
(file)
--- a/
version.inc
+++ b/
version.inc
@@
-5,7
+5,7
@@
quasselVersion = "0.2.0-alpha1+";
quasselDate = "2008-02-27";
quasselVersion = "0.2.0-alpha1+";
quasselDate = "2008-02-27";
- quasselBuild = 59
1
;
+ quasselBuild = 59
2
;
//! Minimum client build number the core needs
clientBuildNeeded = 563;
//! Minimum client build number the core needs
clientBuildNeeded = 563;