From 9e6976224e99b5e4bb5833e786de92c60da213b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Fri, 19 Oct 2012 13:15:51 +0000 Subject: [PATCH] show page information in window title; refs #166 --- src/browser.hxx | 18 ++++++++++++++++++ src/swissbrowser_de.ts | 16 +++++++++++++--- src/swissbrowser_en.ts | 16 +++++++++++++--- src/swissbrowser_fr.ts | 16 +++++++++++++--- src/swissbrowser_it.ts | 16 +++++++++++++--- 5 files changed, 70 insertions(+), 12 deletions(-) diff --git a/src/browser.hxx b/src/browser.hxx index c299e1b..018f132 100644 --- a/src/browser.hxx +++ b/src/browser.hxx @@ -658,6 +658,7 @@ class Browser: public QMainWindow, protected Ui::Browser { ->url().toString()); qobject_cast(_url)->setCursorPosition(0); } + resetWindowTitle(); activateTab(); } @@ -976,6 +977,23 @@ class Browser: public QMainWindow, protected Ui::Browser { TRC; LOG<setTabText(_tabs->indexOf(qobject_cast(sender())), trUtf8("%1").arg(text)); + resetWindowTitle(); + } + + void resetWindowTitle() { + if (qobject_cast(_tabs->currentWidget())) + setWindowTitle(trUtf8("[%1] - %2 - SwissBrowser (%3)", + "main window title " + "%1 = host name " + "%2 = page title " + "%3 = number of open tabs") + .arg((qobject_cast(_tabs->currentWidget()) + ->url().host())) + .arg((qobject_cast(_tabs->currentWidget()) + ->title())) + .arg(_tabs->count())); + else + setWindowTitle(trUtf8("SwissBrowser", "window title with no tab")); } void statusBarMessage(const QString& text) { diff --git a/src/swissbrowser_de.ts b/src/swissbrowser_de.ts index 743359d..5a1c118 100644 --- a/src/swissbrowser_de.ts +++ b/src/swissbrowser_de.ts @@ -403,6 +403,16 @@ qt-%5 (%6) openssl-%7 (%9) %10 + + [%1] - %2 - SwissBrowser (%3) + main window title %1 = host name %2 = page title %3 = number of open tabs + + + + SwissBrowser + window title with no tab + + Certificate @@ -580,15 +590,15 @@ openssl-%7 (%9) %10 - <strong>Unknown network error (code: %1).</string> + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> - <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> + Unknown network error (code: %1). diff --git a/src/swissbrowser_en.ts b/src/swissbrowser_en.ts index a28db59..611493c 100644 --- a/src/swissbrowser_en.ts +++ b/src/swissbrowser_en.ts @@ -403,6 +403,16 @@ qt-%5 (%6) openssl-%7 (%9) %10 + + [%1] - %2 - SwissBrowser (%3) + main window title %1 = host name %2 = page title %3 = number of open tabs + + + + SwissBrowser + window title with no tab + + Certificate @@ -580,15 +590,15 @@ openssl-%7 (%9) %10 - <strong>Unknown network error (code: %1).</string> + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> - <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> + Unknown network error (code: %1). diff --git a/src/swissbrowser_fr.ts b/src/swissbrowser_fr.ts index 743359d..5a1c118 100644 --- a/src/swissbrowser_fr.ts +++ b/src/swissbrowser_fr.ts @@ -403,6 +403,16 @@ qt-%5 (%6) openssl-%7 (%9) %10 + + [%1] - %2 - SwissBrowser (%3) + main window title %1 = host name %2 = page title %3 = number of open tabs + + + + SwissBrowser + window title with no tab + + Certificate @@ -580,15 +590,15 @@ openssl-%7 (%9) %10 - <strong>Unknown network error (code: %1).</string> + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> - <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> + Unknown network error (code: %1). diff --git a/src/swissbrowser_it.ts b/src/swissbrowser_it.ts index 007d92e..49e32ae 100644 --- a/src/swissbrowser_it.ts +++ b/src/swissbrowser_it.ts @@ -403,6 +403,16 @@ qt-%5 (%6) openssl-%7 (%9) %10 + + [%1] - %2 - SwissBrowser (%3) + main window title %1 = host name %2 = page title %3 = number of open tabs + + + + SwissBrowser + window title with no tab + + Certificate @@ -580,15 +590,15 @@ openssl-%7 (%9) %10 - <strong>Unknown network error (code: %1).</string> + <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> - <h1>Network Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl> + <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> - <h1>SSL Error</h1><dl><dt>URL:</dt><dd>%1</dd><dt>Error Code:</dt><dd>%3</dd><dt>Error Details:</dt><dd>%2</dd></dl><table><caption>Certificate Issuer</caption><tr><th>Organization:</th><td>%4</td></tr><tr><th>Common Name:</th><td>%5</td></tr><tr><th>Location:</th><td>%6</td></tr><tr><th>Organizational Unit:</th><td>%7</td></tr><tr><th>Country:</th><td>%8</td></tr><tr><th>State or Provive:</th><td>%9</td></tr></table><table><caption>Certificate Subject</caption><tr><th>Organization:</th><td>%10</td></tr><tr><th>Common Name:</th><td>%11</td></tr><tr><th>Location:</th><td>%12</td></tr><tr><th>Organizational Unit:</th><td>%13</td></tr><tr><th>Country:</th><td>%14</td></tr><tr><th>State or Province:</th><td>%15</td></tr></table> + Unknown network error (code: %1).