[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7215 - in gnunet-qt/src: common plugins/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7215 - in gnunet-qt/src: common plugins/fs |
Date: |
Sat, 14 Jun 2008 14:04:55 -0600 (MDT) |
Author: durner
Date: 2008-06-14 14:04:55 -0600 (Sat, 14 Jun 2008)
New Revision: 7215
Modified:
gnunet-qt/src/common/Makefile.am
gnunet-qt/src/plugins/fs/Makefile.am
gnunet-qt/src/plugins/fs/ecrsuri.cc
gnunet-qt/src/plugins/fs/ecrsuri.h
gnunet-qt/src/plugins/fs/fs-search.cc
gnunet-qt/src/plugins/fs/fs.cc
gnunet-qt/src/plugins/fs/searchSummaryController.cc
gnunet-qt/src/plugins/fs/searchSummaryModel.cc
gnunet-qt/src/plugins/fs/searchSummaryModel.h
Log:
fix display of search terms (Mantis #1354)
Modified: gnunet-qt/src/common/Makefile.am
===================================================================
--- gnunet-qt/src/common/Makefile.am 2008-06-14 18:30:47 UTC (rev 7214)
+++ gnunet-qt/src/common/Makefile.am 2008-06-14 20:04:55 UTC (rev 7215)
@@ -19,7 +19,7 @@
gstring.cc: ui_textEditor.h
libgnunetqt_common_la_LDFLAGS = \
- -lgnunetutil @LIBS@
+ -lgnunetutil -lgnunetnamespace @LIBS@
nodist_libgnunetqt_common_la_SOURCES = \
ui_textEditor.h \
Modified: gnunet-qt/src/plugins/fs/Makefile.am
===================================================================
--- gnunet-qt/src/plugins/fs/Makefile.am 2008-06-14 18:30:47 UTC (rev
7214)
+++ gnunet-qt/src/plugins/fs/Makefile.am 2008-06-14 20:04:55 UTC (rev
7215)
@@ -63,7 +63,7 @@
$(top_builddir)/src/common/libgnunetqt_common.la
libgnunetqtmodule_fs_la_LDFLAGS = \
- -lextractor -lgnunetutil -lgnunetecrs -lgnunetfsui @LIBS@ -export-dynamic
-avoid-version -module
+ -lextractor -lgnunetutil -lgnunetecrs -lgnunetnamespace -lgnunetfsui @LIBS@
-export-dynamic -avoid-version -module
EXTRA_DIST = \
fs.ui \
Modified: gnunet-qt/src/plugins/fs/ecrsuri.cc
===================================================================
--- gnunet-qt/src/plugins/fs/ecrsuri.cc 2008-06-14 18:30:47 UTC (rev 7214)
+++ gnunet-qt/src/plugins/fs/ecrsuri.cc 2008-06-14 20:04:55 UTC (rev 7215)
@@ -27,6 +27,8 @@
#include "ecrsuri.h"
#include "gnunet_qt_common.h"
+#include <GNUnet/gnunet_namespace_lib.h>
+
GFSEcrsUri::GFSEcrsUri()
{
ecrsUri = NULL;
@@ -114,6 +116,19 @@
return strRet;
}
+QString GFSEcrsUri::toDisplayString(struct GNUNET_GC_Configuration *cfg,
+ struct GNUNET_GE_Context *ectx)
+{
+ if (GNUNET_ECRS_uri_test_ksk(ecrsUri))
+ return GNUNET_ECRS_ksk_uri_to_human_readable_string(ecrsUri);
+ else
+ return GNUNET_NS_sks_uri_to_human_readable_string(ectx, cfg, ecrsUri);
+
+ GNUNET_GE_BREAK (ectx, 0);
+
+ return "";
+}
+
QString GFSEcrsUri::serialized()
{
char *str;
Modified: gnunet-qt/src/plugins/fs/ecrsuri.h
===================================================================
--- gnunet-qt/src/plugins/fs/ecrsuri.h 2008-06-14 18:30:47 UTC (rev 7214)
+++ gnunet-qt/src/plugins/fs/ecrsuri.h 2008-06-14 20:04:55 UTC (rev 7215)
@@ -41,6 +41,8 @@
const GNUNET_ECRS_URI *uri();
QString toString();
+ QString toDisplayString(struct GNUNET_GC_Configuration *cfg,
+ struct GNUNET_GE_Context *ectx);
QString serialized();
bool operator==(const GFSEcrsUri &rvalue);
Modified: gnunet-qt/src/plugins/fs/fs-search.cc
===================================================================
--- gnunet-qt/src/plugins/fs/fs-search.cc 2008-06-14 18:30:47 UTC (rev
7214)
+++ gnunet-qt/src/plugins/fs/fs-search.cc 2008-06-14 20:04:55 UTC (rev
7215)
@@ -156,7 +156,7 @@
void GFSSearch::resultInserted()
{
tab->setTabText(tab->indexOf(this),
- uri.toString() + " (" + QString::number(m->rowCount()) + ")");
+ uri.toDisplayString(fs->config(), fs->errorContext()) + " (" +
QString::number(m->rowCount()) + ")");
}
void GFSSearch::setupColumns()
Modified: gnunet-qt/src/plugins/fs/fs.cc
===================================================================
--- gnunet-qt/src/plugins/fs/fs.cc 2008-06-14 18:30:47 UTC (rev 7214)
+++ gnunet-qt/src/plugins/fs/fs.cc 2008-06-14 20:04:55 UTC (rev 7215)
@@ -359,7 +359,7 @@
/* first tab is already used. Create a new one. */
tab = new GFSSearch(this, tabResults);
tab->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- tabResults->addTab(tab, info->uri.toString());
+ tabResults->addTab(tab, info->uri.toDisplayString(cfg, ectx));
tabIdx = tabResults->count() - 1;
}
else
Modified: gnunet-qt/src/plugins/fs/searchSummaryController.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchSummaryController.cc 2008-06-14 18:30:47 UTC
(rev 7214)
+++ gnunet-qt/src/plugins/fs/searchSummaryController.cc 2008-06-14 20:04:55 UTC
(rev 7215)
@@ -28,7 +28,7 @@
GFSSearchSummaryController::GFSSearchSummaryController(class GFSPlugin *fs)
{
- model = new GFSSearchSummaryModel();
+ model = new GFSSearchSummaryModel(fs->config(), fs->errorContext());
this->fs = fs;
fs->searchSummaryView()->setModel(model);
}
Modified: gnunet-qt/src/plugins/fs/searchSummaryModel.cc
===================================================================
--- gnunet-qt/src/plugins/fs/searchSummaryModel.cc 2008-06-14 18:30:47 UTC
(rev 7214)
+++ gnunet-qt/src/plugins/fs/searchSummaryModel.cc 2008-06-14 20:04:55 UTC
(rev 7215)
@@ -46,8 +46,11 @@
return QVariant();
}
-GFSSearchSummaryModel::GFSSearchSummaryModel() : QAbstractItemModel()
+GFSSearchSummaryModel::GFSSearchSummaryModel(struct GNUNET_GC_Configuration
*cfg,
+ struct GNUNET_GE_Context *ectx) : QAbstractItemModel()
{
+ this->cfg = cfg;
+ this->ectx = ectx;
}
QModelIndex GFSSearchSummaryModel::index(int row, int column,
@@ -91,7 +94,7 @@
switch(index.column())
{
case 0:
- return QVariant(result.uri.toString());
+ return QVariant(result.uri.toDisplayString(cfg, ectx));
case 1:
return QVariant(result.count);
case 2:
Modified: gnunet-qt/src/plugins/fs/searchSummaryModel.h
===================================================================
--- gnunet-qt/src/plugins/fs/searchSummaryModel.h 2008-06-14 18:30:47 UTC
(rev 7214)
+++ gnunet-qt/src/plugins/fs/searchSummaryModel.h 2008-06-14 20:04:55 UTC
(rev 7215)
@@ -39,7 +39,8 @@
Q_OBJECT
public:
- GFSSearchSummaryModel();
+ GFSSearchSummaryModel(struct GNUNET_GC_Configuration *cfg,
+ struct GNUNET_GE_Context *ectx);
QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const;
QModelIndex index(int row, int column, const QModelIndex &parent =
@@ -72,6 +73,8 @@
GFSSearchList::iterator find(const struct GNUNET_FSUI_SearchList *handle);
GFSSearchList results;
+ struct GNUNET_GC_Configuration *cfg;
+ struct GNUNET_GE_Context *ectx;
};
#endif /*SEARCHESMODEL_H_*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7215 - in gnunet-qt/src: common plugins/fs,
gnunet <=