[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1243: Clean up the message log a bit and privatize a method that d (trunk/src/gui/log)
Author: edmanm
Date: 2006-09-25 21:35:34 -0400 (Mon, 25 Sep 2006)
New Revision: 1243
Modified:
trunk/src/gui/log/logtreewidget.cpp
trunk/src/gui/log/logtreewidget.h
trunk/src/gui/log/messagelog.cpp
Log:
Clean up the message log a bit and privatize a method that didn't need to be
public.
Modified: trunk/src/gui/log/logtreewidget.cpp
===================================================================
--- trunk/src/gui/log/logtreewidget.cpp 2006-09-26 00:59:10 UTC (rev 1242)
+++ trunk/src/gui/log/logtreewidget.cpp 2006-09-26 01:35:34 UTC (rev 1243)
@@ -98,13 +98,13 @@
/** Clears all items from the message log and resets the counter in the status
* bar. */
void
-LogTreeWidget::clear()
+LogTreeWidget::clearMessages()
{
/* Clear the messages */
- QTreeWidget::clear();
+ clear();
/* This should always be 0, but just in case clear() doesn't really remove
* all, we'll get the current count again. */
- setStatusTip(tr("Messages Shown: %1").arg(itemCount()));
+ setStatusTip(tr("Messages Shown: %1").arg(messageCount()));
}
/** Adjusts the message column width to accomodate long messages. */
@@ -117,7 +117,7 @@
/** Adds a message log item. */
void
-LogTreeWidget::addItem(LogTreeItem *item)
+LogTreeWidget::addMessageItem(LogTreeItem *item)
{
/* Add the new item. */
addTopLevelItem(item);
@@ -127,19 +127,19 @@
/** Returns a list of all currently selected items. */
QList<LogTreeItem *>
-LogTreeWidget::selectedItems()
+LogTreeWidget::selectedMessages()
{
QList<LogTreeItem *> items =
- qlist_cast(QTreeWidget::selectedItems());
+ qlist_cast(selectedItems());
return qlist_sort(items);
}
/** Returns a list of all selected items as a formatted string. */
QString
-LogTreeWidget::selectedItemsText()
+LogTreeWidget::selectedMessagesText()
{
QString text;
- foreach (LogTreeItem *item, selectedItems()) {
+ foreach (LogTreeItem *item, selectedMessages()) {
text.append(item->toString());
}
return text;
@@ -147,7 +147,7 @@
/** Returns a list of all items in the tree. */
QList<LogTreeItem *>
-LogTreeWidget::allItems()
+LogTreeWidget::allMessages()
{
/* Find all items */
QList<LogTreeItem *> items =
@@ -157,16 +157,16 @@
/** Returns the number of items currently shown. */
int
-LogTreeWidget::itemCount()
+LogTreeWidget::messageCount()
{
return topLevelItemCount();
}
/** Sets the maximum number of items in the tree. */
void
-LogTreeWidget::setMaximumItemCount(int max)
+LogTreeWidget::setMaximumMessageCount(int max)
{
- while (max < itemCount()) {
+ while (max < messageCount()) {
/* If the new max is less than the currently displayed number of
* items, then we'll get rid of some. */
delete takeTopLevelItem(0);
@@ -178,7 +178,7 @@
void
LogTreeWidget::deselectAll()
{
- foreach(LogTreeItem *item, selectedItems()) {
+ foreach(LogTreeItem *item, selectedMessages()) {
setItemSelected(item, false);
}
}
@@ -190,18 +190,18 @@
LogTreeItem *item = new LogTreeItem(type, message);
/* If we need to make room, then make some room */
- if (itemCount() >= _maxItemCount) {
+ if (messageCount() >= _maxItemCount) {
delete takeTopLevelItem(0);
}
/* Add the new message item and scroll to it (if necessary) */
- addItem(item);
+ addMessageItem(item);
if (_scrollOnNewItem) {
scrollToItem(item);
}
/* Update our tooltip and return the new log item */
- setStatusTip(tr("Messages Shown: %1").arg(itemCount()));
+ setStatusTip(tr("Messages Shown: %1").arg(messageCount()));
return item;
}
@@ -210,7 +210,7 @@
LogTreeWidget::filter(uint filter)
{
LogTreeItem *item;
- int index = topLevelItemCount() - 1;
+ int index = messageCount() - 1;
int itemsShown = 0;
while (index > -1) {
@@ -223,7 +223,7 @@
index--;
}
- setStatusTip(tr("Messages Shown: %1").arg(itemCount()));
+ setStatusTip(tr("Messages Shown: %1").arg(messageCount()));
}
/** Searches the log for entries that contain the given text. */
Modified: trunk/src/gui/log/logtreewidget.h
===================================================================
--- trunk/src/gui/log/logtreewidget.h 2006-09-26 00:59:10 UTC (rev 1242)
+++ trunk/src/gui/log/logtreewidget.h 2006-09-26 01:35:34 UTC (rev 1243)
@@ -54,21 +54,20 @@
/** Default constructor. */
LogTreeWidget(QWidget *parent = 0);
- /** Adds a message log item. */
- void addItem(LogTreeItem *item);
+
/** Returns a list of all currently selected items. */
- QList<LogTreeItem *> selectedItems();
+ QList<LogTreeItem *> selectedMessages();
/** Returns a list of all selected items as a formatted string. */
- QString selectedItemsText();
+ QString selectedMessagesText();
/** Returns a list of all items in the tree. */
- QList<LogTreeItem *> allItems();
+ QList<LogTreeItem *> allMessages();
/** Deselects all currently selected items. */
void deselectAll();
/** Returns the number of items currently in the tree. */
- int itemCount();
+ int messageCount();
/** Sets the maximum number of items in the tree. */
- void setMaximumItemCount(int max);
+ void setMaximumMessageCount(int max);
/** Filters the log according to the specified filter. */
void filter(uint filter);
@@ -83,7 +82,7 @@
public slots:
/** Clears all contents on the message log and resets the counter. */
- void clear();
+ void clearMessages();
protected:
/** Sets the default, initial column header widths. */
@@ -94,6 +93,8 @@
void onVerticalScroll(int value);
private:
+ /** Adds a message log item. */
+ void addMessageItem(LogTreeItem *item);
/** Casts a QList of one pointer type to another. */
QList<LogTreeItem *> qlist_cast(QList<QTreeWidgetItem *> inlist);
/** Sortrs a QList of pointers to tree items. */
Modified: trunk/src/gui/log/messagelog.cpp
===================================================================
--- trunk/src/gui/log/messagelog.cpp 2006-09-26 00:59:10 UTC (rev 1242)
+++ trunk/src/gui/log/messagelog.cpp 2006-09-26 01:35:34 UTC (rev 1243)
@@ -160,7 +160,7 @@
uint maxMsgCount = getSetting(SETTING_MAX_MSG_COUNT,
DEFAULT_MAX_MSG_COUNT).toUInt();
ui.spnbxMaxCount->setValue(maxMsgCount);
- ui.lstMessages->setMaximumItemCount(maxMsgCount);
+ ui.lstMessages->setMaximumMessageCount(maxMsgCount);
/* Set whether or not logging to file is enabled */
_enableLogging = getSetting(SETTING_ENABLE_LOGFILE,
@@ -238,7 +238,7 @@
/* Update the maximum displayed item count */
saveSetting(SETTING_MAX_MSG_COUNT, ui.spnbxMaxCount->value());
- ui.lstMessages->setMaximumItemCount(ui.spnbxMaxCount->value());
+ ui.lstMessages->setMaximumMessageCount(ui.spnbxMaxCount->value());
/* Save message filter and refilter the list */
uint filter = 0;
@@ -327,21 +327,21 @@
void
MessageLog::saveSelected()
{
- save(ui.lstMessages->selectedItems());
+ save(ui.lstMessages->selectedMessages());
}
/** Saves all shown messages to a file. */
void
MessageLog::saveAll()
{
- save(ui.lstMessages->allItems());
+ save(ui.lstMessages->allMessages());
}
/** Copies contents of currently selected messages to the 'clipboard'. */
void
MessageLog::copy()
{
- QString contents = ui.lstMessages->selectedItemsText();
+ QString contents = ui.lstMessages->selectedMessagesText();
if (!contents.isEmpty()) {
/* Clear anything on the clipboard */
QApplication::clipboard()->clear();