Attachment #84246 for bug #129298

View | Details | Raw Unified | Return to bug 129298
Collapse All | Expand All

Lines 83-88 Link Here

(-)kerry-0.1/src/beaglesearch.cpp (+9 lines)
83	{ BeagleSearch::Website, "dc:title", 0 },	83	{ BeagleSearch::Website, "dc:title", 0 },
84	{ BeagleSearch::Website, "Title", 0 },	84	{ BeagleSearch::Website, "Title", 0 },
85	{ BeagleSearch::Note, "dc:title", 0 },	85	{ BeagleSearch::Note, "dc:title", 0 },
		86	// Gentoo ebuilds
		87	{ BeagleSearch::Ebuilds, "dc:title", I18N_NOOP("Title: %1")"<br>" },
		88	{ BeagleSearch::Ebuilds, "dc:description", 0 },
		89	{ BeagleSearch::Ebuilds, "fixme:version", I18N_NOOP("Version: %1")"<br>" },
		90	{ BeagleSearch::Ebuilds, "dc:source", 0 },
		91	{ BeagleSearch::Ebuilds, "fixme:download_size", 0 },
		92	{ BeagleSearch::Ebuilds, "fixme:install_time", 0 },
		93	{ BeagleSearch::Ebuilds, "fixme:contents_byte_count", 0 },
86	{ BeagleSearch::Unknown, "dc:author", I18N_NOOP("Author: %1")"<br>" },	94	{ BeagleSearch::Unknown, "dc:author", I18N_NOOP("Author: %1")"<br>" },
87	{ BeagleSearch::Unknown, "dc:title", I18N_NOOP("Title: %1")"<br>" },	95	{ BeagleSearch::Unknown, "dc:title", I18N_NOOP("Title: %1")"<br>" },
88	// Calendar	96	// Calendar
Lines 148-153 Link Here
148	{ BeagleSearch::Website, 0, "Google", 0 },	156	{ BeagleSearch::Website, 0, "Google", 0 },
149	{ BeagleSearch::Website, 0, "WebHistory", 0 },	157	{ BeagleSearch::Website, 0, "WebHistory", 0 },
150	{ BeagleSearch::Website, 0, 0, "beagle/x-konq-cache" },	158	{ BeagleSearch::Website, 0, 0, "beagle/x-konq-cache" },
		159	{ BeagleSearch::Ebuilds, "*.ebuild", 0, 0 },
151	{ BeagleSearch::Unknown, "file://", "File", 0 }, // mimetype wildcard must be last	160	{ BeagleSearch::Unknown, "file://", "File", 0 }, // mimetype wildcard must be last
152	{ 0, 0, 0, 0}	161	{ 0, 0, 0, 0}
153	};	162	};

Lines 51-57 Link Here

(-)kerry-0.1/src/beaglesearch.h (-1 / +2 lines)
51	Conversations, // in combo box	51	Conversations, // in combo box
52	Website, // in combo box	52	Website, // in combo box
53	Feed,	53	Feed,
54	Note	54	Note,
		55	Ebuilds
55	};	56	};
56		57
57	typedef QValueList<QString> PropertyList;	58	typedef QValueList<QString> PropertyList;




        item->insertHeaderWidget(0,headerFileLabel);
        connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen()));
      }
      else if (result->tilegroup == BeagleSearch::Ebuilds) {
        item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("kuroo", KIcon::NoGroup, KIcon::SizeLarge));
    
        KerryLabel *headerFileLabel = new KerryLabel(item);
        headerFileLabel->setText(url.fileName());
        headerFileLabel->setTipText(url.prettyURL());
        headerFileLabel->setUseTips();
        headerFileLabel->setURL(*(result->uri));
        item->insertHeaderWidget(0,headerFileLabel);
        connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen()));
    
        QLabel *headerLabel = new QLabel(item);
        headerLabel->setText(i18n(" from "));
        headerLabel->setAlignment(headerLabel->alignment() | Qt::SingleLine);
        item->insertHeaderWidget(1,headerLabel);
    
        QStringList _properties(result->properties);
        QString homepage = takeProperty("dc:source",_properties);
	if (!homepage.isEmpty())
	{
		KerryLabel *headerFileLabel = new KerryLabel(item);
		headerFileLabel->setText(homepage);
		headerFileLabel->setAlignment(headerFileLabel->alignment() | Qt::SingleLine);
		headerFileLabel->setURL(homepage);
		item->insertHeaderWidget(2,headerFileLabel);
		connect(headerFileLabel, SIGNAL(leftClickedURL(const QString&)), SLOT(slotOpenURL(const QString&)));
	}

        item->setDescriptionText(takeProperty("dc:description", _properties));
    
        QString properties;
	QString install_time_str = takeProperty("fixme:install_time", _properties);
	if (!install_time_str.isEmpty())
	{
            properties=properties+i18n("Installed On: %1").arg(KGlobal::locale()->formatDateTime(datetimeFromString(install_time_str),false))+"<br>";
	}

	QString install_size_str = takeProperty("fixme:contents_byte_count", _properties);
	if (!install_size_str.isEmpty())
	{
            properties=properties+i18n("Installed Size: %1").arg(formatBytes(install_size_str))+"<br>";
	}

	QString download_size_str = takeProperty("fixme:download_size", _properties);
	if (!download_size_str.isEmpty())
	{
            properties=properties+i18n("Download Size: %1").arg(formatBytes(download_size_str))+"<br>";
	}
		
        BeagleSearch::PropertyList::iterator it;
        for ( it = _properties.begin(); it != _properties.end(); ++it )
	{
                properties=properties+(*it);
	}

        if (result->snippet) {
          if (!properties.isEmpty())
             properties=properties+"<br>";
          properties=properties+*(result->snippet);
        }
   
        if (!properties.isEmpty())
            item->setPropertiesText("<qt>"+properties+"</qt>");
    

        item->insertHitSpacing(2,10);
        buttonGo = new KURLLabel(item);
        buttonGo->setPixmap(SmallIcon("kfm"));
        item->insertHitWidget(3,buttonGo);
        connect(buttonGo, SIGNAL(leftClickedURL()), SLOT(slotOpenDir()));
    
        buttonGo = new KURLLabel(item);
        buttonGo->setText(i18n("Reveal in File Manager"));
        item->insertHitWidget(4,buttonGo);
        connect(buttonGo, SIGNAL(leftClickedURL()), SLOT(slotOpenDir()));
      }
      else {
        KFileItem *fileitem=new KFileItem(*(result->uri),*(result->mime_type),KFileItem::Unknown);
        item->icon->setPixmap(fileitem->pixmap(KIcon::SizeHuge, KIcon::DefaultState));

          case Website:
		show = ( result->tilegroup == BeagleSearch::Website);
		break;
          case Ebuilds:
		show = ( result->tilegroup == BeagleSearch::Ebuilds);
		break;
          default:
		break;
        }

    }
}

void SearchDlg::slotOpenURL(const QString& url)
{
    KURL urlObj(url);
    //KRun run(urlObj);
    //run.setAutoDelete(false);
    KRun::runURL(url, "text/html", false, true);
}

QString SearchDlg::formatBytes(QString& bytesStr) const
{
        static double kilobyte = 1024.0;
        static double megabyte = 1024.0*1024.0;
	double bytes = KGlobal::locale()->readNumber(bytesStr);
        if (bytes < megabyte)
                return KGlobal::locale()->formatNumber(bytes/kilobyte, 2) + "K";
        return KGlobal::locale()->formatNumber(bytes/megabyte, 2) + "M";
}

void SearchDlg::slotStartBeagle()
{
    if (cb_beagleStart->isChecked()) {




		Conversations,
		Images,
		Media,
                Website,
		Ebuilds
	};

	enum SortType {

    void slotOpenDir();
    void slotMailTo(const QString&);
    void slotOpenEvolution(const QString&);
    void slotOpenURL(const QString&);
    void slotContextMenu( int row, int col, const QPoint & pos );
    void slotPreview(const KFileItem *, const QPixmap &);
    void slotPreviewResult();

    void fillTableHits();
    void updateStatus();
    void showQuickTips();
    QString formatBytes(QString& bytesStr) const;
    QCheckBox* cb_beagleStart;

    void displayResults(BeagleSearch::BeagleResultList &items);

Lines 250-255 Link Here

(-)kerry-0.1/src/searchdlg_layout.ui (+5 lines)
250	<string>Web Pages</string>	250	<string>Web Pages</string>
251	</property>	251	</property>
252	</item>	252	</item>
		253	<item>
		254	<property name="text">
		255	<string>Ebuilds</string>
		256	</property>
		257	</item>
253	<property name="name">	258	<property name="name">
254	<cstring>comboShow</cstring>	259	<cstring>comboShow</cstring>
255	</property>	260	</property>

Return to bug 129298

Lines 548-553 Link Here

(-)kerry-0.1/src/searchdlg.cpp (+97 lines)
548	item->insertHeaderWidget(0,headerFileLabel);	548	item->insertHeaderWidget(0,headerFileLabel);
549	connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen()));	549	connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen()));
550	}	550	}
		551	else if (result->tilegroup == BeagleSearch::Ebuilds) {
		552	item->icon->setPixmap(KGlobal::iconLoader()->loadIcon("kuroo", KIcon::NoGroup, KIcon::SizeLarge));
		553
		554	KerryLabel *headerFileLabel = new KerryLabel(item);
		555	headerFileLabel->setText(url.fileName());
		556	headerFileLabel->setTipText(url.prettyURL());
		557	headerFileLabel->setUseTips();
		558	headerFileLabel->setURL(*(result->uri));
		559	item->insertHeaderWidget(0,headerFileLabel);
		560	connect(headerFileLabel, SIGNAL(leftClickedURL()), SLOT(slotOpen()));
		561
		562	QLabel *headerLabel = new QLabel(item);
		563	headerLabel->setText(i18n(" from "));
		564	headerLabel->setAlignment(headerLabel->alignment() \| Qt::SingleLine);
		565	item->insertHeaderWidget(1,headerLabel);
		566
		567	QStringList _properties(result->properties);
		568	QString homepage = takeProperty("dc:source",_properties);
		569	if (!homepage.isEmpty())
		570	{
		571	KerryLabel *headerFileLabel = new KerryLabel(item);
		572	headerFileLabel->setText(homepage);
		573	headerFileLabel->setAlignment(headerFileLabel->alignment() \| Qt::SingleLine);
		574	headerFileLabel->setURL(homepage);
		575	item->insertHeaderWidget(2,headerFileLabel);
		576	connect(headerFileLabel, SIGNAL(leftClickedURL(const QString&)), SLOT(slotOpenURL(const QString&)));
		577	}
		578
		579	item->setDescriptionText(takeProperty("dc:description", _properties));
		580
		581	QString properties;
		582	QString install_time_str = takeProperty("fixme:install_time", _properties);
		583	if (!install_time_str.isEmpty())
		584	{
		585	properties=properties+i18n("Installed On: %1").arg(KGlobal::locale()->formatDateTime(datetimeFromString(install_time_str),false))+"<br>";
		586	}
		587
		588	QString install_size_str = takeProperty("fixme:contents_byte_count", _properties);
		589	if (!install_size_str.isEmpty())
		590	{
		591	properties=properties+i18n("Installed Size: %1").arg(formatBytes(install_size_str))+"<br>";
		592	}
		593
		594	QString download_size_str = takeProperty("fixme:download_size", _properties);
		595	if (!download_size_str.isEmpty())
		596	{
		597	properties=properties+i18n("Download Size: %1").arg(formatBytes(download_size_str))+"<br>";
		598	}
		599
		600	BeagleSearch::PropertyList::iterator it;
		601	for ( it = _properties.begin(); it != _properties.end(); ++it )
		602	{
		603	properties=properties+(*it);
		604	}
		605
		606	if (result->snippet) {
		607	if (!properties.isEmpty())
		608	properties=properties+"<br>";
		609	properties=properties+*(result->snippet);
		610	}
		611
		612	if (!properties.isEmpty())
		613	item->setPropertiesText("<qt>"+properties+"</qt>");
		614
615
616	item->insertHitSpacing(2,10);
617	buttonGo = new KURLLabel(item);
618	buttonGo->setPixmap(SmallIcon("kfm"));
619	item->insertHitWidget(3,buttonGo);
620	connect(buttonGo, SIGNAL(leftClickedURL()), SLOT(slotOpenDir()));
621
622	buttonGo = new KURLLabel(item);
623	buttonGo->setText(i18n("Reveal in File Manager"));
624	item->insertHitWidget(4,buttonGo);
625	connect(buttonGo, SIGNAL(leftClickedURL()), SLOT(slotOpenDir()));
626	}
551	else {	627	else {
552	KFileItem fileitem=new KFileItem((result->uri),*(result->mime_type),KFileItem::Unknown);	628	KFileItem fileitem=new KFileItem((result->uri),*(result->mime_type),KFileItem::Unknown);
553	item->icon->setPixmap(fileitem->pixmap(KIcon::SizeHuge, KIcon::DefaultState));	629	item->icon->setPixmap(fileitem->pixmap(KIcon::SizeHuge, KIcon::DefaultState));
Lines 669-674 Link Here
669	case Website:	745	case Website:
670	show = ( result->tilegroup == BeagleSearch::Website);	746	show = ( result->tilegroup == BeagleSearch::Website);
671	break;	747	break;
		748	case Ebuilds:
		749	show = ( result->tilegroup == BeagleSearch::Ebuilds);
		750	break;
672	default:	751	default:
673	break;	752	break;
674	}	753	}
Lines 780-785 Link Here
780	}	859	}
781	}	860	}
782		861
		862	void SearchDlg::slotOpenURL(const QString& url)
		863	{
		864	KURL urlObj(url);
		865	//KRun run(urlObj);
		866	//run.setAutoDelete(false);
		867	KRun::runURL(url, "text/html", false, true);
		868	}
		869
		870	QString SearchDlg::formatBytes(QString& bytesStr) const
		871	{
		872	static double kilobyte = 1024.0;
		873	static double megabyte = 1024.0*1024.0;
		874	double bytes = KGlobal::locale()->readNumber(bytesStr);
		875	if (bytes < megabyte)
		876	return KGlobal::locale()->formatNumber(bytes/kilobyte, 2) + "K";
		877	return KGlobal::locale()->formatNumber(bytes/megabyte, 2) + "M";
		878	}
		879
783	void SearchDlg::slotStartBeagle()	880	void SearchDlg::slotStartBeagle()
784	{	881	{
785	if (cb_beagleStart->isChecked()) {	882	if (cb_beagleStart->isChecked()) {

Lines 42-48 Link Here

(-)kerry-0.1/src/searchdlg.h (-1 / +4 lines)
42	Conversations,	42	Conversations,
43	Images,	43	Images,
44	Media,	44	Media,
45	Website	45	Website,
		46	Ebuilds
46	};	47	};
47		48
48	enum SortType {	49	enum SortType {
Lines 85-90 Link Here
85	void slotOpenDir();	86	void slotOpenDir();
86	void slotMailTo(const QString&);	87	void slotMailTo(const QString&);
87	void slotOpenEvolution(const QString&);	88	void slotOpenEvolution(const QString&);
		89	void slotOpenURL(const QString&);
88	void slotContextMenu( int row, int col, const QPoint & pos );	90	void slotContextMenu( int row, int col, const QPoint & pos );
89	void slotPreview(const KFileItem *, const QPixmap &);	91	void slotPreview(const KFileItem *, const QPixmap &);
90	void slotPreviewResult();	92	void slotPreviewResult();
Lines 99-104 Link Here
99	void fillTableHits();	101	void fillTableHits();
100	void updateStatus();	102	void updateStatus();
101	void showQuickTips();	103	void showQuickTips();
		104	QString formatBytes(QString& bytesStr) const;
102	QCheckBox* cb_beagleStart;	105	QCheckBox* cb_beagleStart;
103		106
104	void displayResults(BeagleSearch::BeagleResultList &items);	107	void displayResults(BeagleSearch::BeagleResultList &items);