Ensure encoding for internal files, and refresh index tab when changing encoding.

Author: gonwan

lib/libebook/ebook_chm.cpp

@@ -92,12 +92,12 @@ void EBook_CHM::close()
 
 QString EBook_CHM::title() const
 {
-	return encodeWithCurrentCodec( m_title );
+	return encodeInternalWithCurrentCodec( m_title );
 }
 
 QUrl EBook_CHM::homeUrl() const
 {
-	return pathToUrl( encodeWithCurrentCodec( m_home ) );
+	return pathToUrl( encodeInternalWithCurrentCodec( m_home ) );
 }
 
 bool EBook_CHM::hasFeature( EBook::Feature code ) const
@@ -125,7 +125,7 @@ bool EBook_CHM::getTableOfContents( QList<EBookTocEntry>& toc ) const
 	// Parse the plain text TOC
 	QList< ParsedEntry > parsed;
 
-	if ( !parseFileAndFillArray( encodeWithCurrentCodec( m_topicsFile ), parsed, false ) )
+	if ( !parseFileAndFillArray( encodeInternalWithCurrentCodec( m_topicsFile ), parsed, false ) )
 		return false;
 
 	// Find out the root offset, and reduce the indent level to it
@@ -159,7 +159,7 @@ bool EBook_CHM::getIndex( QList<EBookIndexEntry>& index ) const
 	// Parse the plain text index
 	QList< ParsedEntry > parsed;
 
-	if ( !parseFileAndFillArray( encodeWithCurrentCodec( m_indexFile ), parsed, true ) )
+	if ( !parseFileAndFillArray( encodeInternalWithCurrentCodec( m_indexFile ), parsed, true ) )
 		return false;
 
 	// Find out the root offset, and reduce the indent level to it
@@ -950,11 +950,11 @@ void EBook_CHM::fillTopicsUrlMap()
 		QUrl url = pathToUrl( encodeInternalWithCurrentCodec( ( const char* ) urlstr.data() + off_url ) );
 
 		/*
-		 * Titles are extracted from the <title> field from html pages when compling the chm file, try with text codec.
+		 * Titles are extracted from the <title> field from html pages when compling the chm file.
 		 * These values are used in index search and index with multiple topics selection currently.
 		 */
 		if ( off_title < ( unsigned int )strings.size() )
-			m_url2topics[url] = encodeWithCurrentCodec( ( const char* ) strings.data() + off_title );
+			m_url2topics[url] = encodeInternalWithCurrentCodec( ( const char* ) strings.data() + off_title );
 		else
 			m_url2topics[url] = "Untitled";
 	}

lib/libebook/ebook_chm.h

@@ -206,6 +206,7 @@ class EBook_CHM : public EBook
 					iconid = EBookTocEntry::IMAGE_AUTO;
 					indent = 0;
 				}
+
 				void clear()
 				{
 					name.clear();
@@ -245,9 +246,9 @@ class EBook_CHM : public EBook
 
 		//! Encode the string from internal files with the currently selected text codec, if possible.
 		//! Or return as-is, if not.
-		inline QString encodeInternalWithCurrentCodec( const QString& str ) const
+		inline QString encodeInternalWithCurrentCodec( const QByteArray& str ) const
 		{
-			return ( m_textCodecForSpecialFiles ? m_textCodecForSpecialFiles->toUnicode( qPrintable( str ) ) : str );
+			return ( m_textCodecForSpecialFiles ? m_textCodecForSpecialFiles->toUnicode( str.constData() ) : str );
 		}
 
 		//! Encode the string from internal files with the currently selected text codec, if possible.

src/mainwindow.cpp

@@ -543,6 +543,8 @@ void MainWindow::setTextEncoding( const QString& encoding )
 		}
 	}
 
+	m_navPanel->refresh();
+
 	// Because updateView() will call view->invalidate(), which clears the view->url(),
 	// we have to make a copy of it.
 	QUrl url = currentBrowser()->url();

src/navigationpanel.cpp

@@ -116,6 +116,8 @@ void NavigationPanel::getSettings( Settings* settings )
 
 void NavigationPanel::refresh()
 {
+	if ( m_indexTab )
+		m_indexTab->refillIndex();
 	if ( m_contentsTab )
 		m_contentsTab->refillTableOfContents();
 }

src/tab_index.h

@@ -37,6 +37,7 @@ class TabIndex : public QWidget, public Ui::TabIndex
 	public:
 		TabIndex( QWidget* parent = 0 );
 
+		void    refillIndex();
 		void    invalidate();
 		void    search( const QString& index );
 		void    focus();
@@ -50,8 +51,6 @@ class TabIndex : public QWidget, public Ui::TabIndex
 	private:
 		void    showEvent( QShowEvent* );
 
-		void    refillIndex();
-
 		QMenu*              m_contextMenu;
 		QTreeWidgetItem*        m_lastSelectedItem;
 		bool                m_indexListFilled;